diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-22 00:14:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-22 00:14:39 +0100 |
| commit | d203add8925f4744f6bad6b84870988efe108262 (patch) | |
| tree | 80b6ddacb7b46e4cba649882b2b9c76882826bd0 | |
| parent | Merge branch 'ab/config-mak-uname-simplify' (diff) | |
| parent | mergetool: avoid letting `list_tool_variants` break user-defined setups (diff) | |
| download | git-d203add8925f4744f6bad6b84870988efe108262.tar.xz git-d203add8925f4744f6bad6b84870988efe108262.zip | |
Merge branch 'pd/mergetool-nvimdiff'
Fix regression introduced when nvimdiff support in mergetool was added.
* pd/mergetool-nvimdiff:
mergetool: avoid letting `list_tool_variants` break user-defined setups
mergetools/bc: add `bc4` to the alias list for Beyond Compare
| -rw-r--r-- | git-mergetool--lib.sh | 4 | ||||
| -rw-r--r-- | mergetools/bc | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 2defef28cd..7225abd811 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -138,6 +138,10 @@ setup_user_tool () { merge_cmd () { ( eval $merge_tool_cmd ) } + + list_tool_variants () { + echo "$tool" + } } setup_tool () { diff --git a/mergetools/bc b/mergetools/bc index a89086ee72..26c19d46a5 100644 --- a/mergetools/bc +++ b/mergetools/bc @@ -25,4 +25,5 @@ translate_merge_tool_path() { list_tool_variants () { echo bc echo bc3 + echo bc4 } |