diff options
| author | David Aguilar <davvid@gmail.com> | 2019-04-04 00:34:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-04 18:21:25 +0900 |
| commit | eb12adc74cf22add318f884072be2071d181abaa (patch) | |
| tree | 7ed1a9baea8d2cb6a57472b647f1c009fe9c61bc /git-mergetool--lib.sh | |
| parent | 041f5ea1cf987a4068ef5f39ba0a09be85952064 (diff) | |
| download | git-eb12adc74cf22add318f884072be2071d181abaa.tar.gz | |
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 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 83bf52494c..aaa4eed0bc 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -279,6 +279,7 @@ list_merge_tool_candidates () { fi tools="$tools gvimdiff diffuse diffmerge ecmerge" tools="$tools p4merge araxis bc codecompare" + tools="$tools smerge" fi case "${VISUAL:-$EDITOR}" in *vim*) |