summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2019-04-04 07:34:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-04 09:21:25 (GMT)
commiteb12adc74cf22add318f884072be2071d181abaa (patch)
tree7ed1a9baea8d2cb6a57472b647f1c009fe9c61bc /mergetools
parent041f5ea1cf987a4068ef5f39ba0a09be85952064 (diff)
downloadgit-eb12adc74cf22add318f884072be2071d181abaa.zip
git-eb12adc74cf22add318f884072be2071d181abaa.tar.gz
git-eb12adc74cf22add318f884072be2071d181abaa.tar.bz2
mergetools: add support for smerge (Sublime Merge)
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>
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/smerge12
1 files changed, 12 insertions, 0 deletions
diff --git a/mergetools/smerge b/mergetools/smerge
new file mode 100644
index 0000000..9c2e6f6
--- /dev/null
+++ b/mergetools/smerge
@@ -0,0 +1,12 @@
+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
+}