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>
David Aguilar committed
Apr 4, 2019 at 00:34 UTC
eb12adc74cf22add318f884072be2071d181abaa
2 files changed
+13
git-mergetool--lib.sh
+1
@@ -279,6 +279,7 @@ list_merge_tool_candidates () {
279
fi
280
tools="$tools gvimdiff diffuse diffmerge ecmerge"
281
tools="$tools p4merge araxis bc codecompare"
282
+ tools="$tools smerge"
283
fi
284
case "${VISUAL:-$EDITOR}" in
285
*vim*)
mergetools/smerge
new
+12
@@ -0,0 +1,12 @@
1
+diff_cmd () {
2
+ "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
3
+}
4
+
5
+merge_cmd () {
6
+ if $base_present
7
+ then
8
+ "$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
9
+ else
10
+ "$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
11
+ fi
12
+}