mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
eb12adc74c
Teach difftool and mergetool about the Sublime Merge "smerge" command. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 lines
264 B
Text
12 lines
264 B
Text
diff_cmd () {
|
|
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
|
|
else
|
|
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
|
|
fi
|
|
}
|