diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
| commit | 123dfdff0d6e886ce5536d39dd77dcd46db8d4c0 (patch) | |
| tree | f4773e28ec45311814abcd32f94ab581a2a24895 /mergetools/diffmerge | |
| parent | Merge branch 'jh/p4-various-fixups' (diff) | |
| parent | mergetools: add description to all diff/merge tools (diff) | |
| download | git-123dfdff0d6e886ce5536d39dd77dcd46db8d4c0.tar.gz git-123dfdff0d6e886ce5536d39dd77dcd46db8d4c0.zip | |
Merge branch 'fr/vimdiff-layout'
Reimplement "vimdiff[123]" mergetool drivers with a more generic
layout mechanism.
* fr/vimdiff-layout:
mergetools: add description to all diff/merge tools
vimdiff: add tool documentation
vimdiff: integrate layout tests in the unit tests framework ('t' folder)
vimdiff: new implementation with layout support
Diffstat (limited to 'mergetools/diffmerge')
| -rw-r--r-- | mergetools/diffmerge | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/diffmerge b/mergetools/diffmerge index 9b6355b98a..9b5b62d1ca 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 } +diff_cmd_help () { + echo "Use DiffMerge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -13,6 +17,10 @@ merge_cmd () { fi } +merge_cmd_help () { + echo "Use DiffMerge (requires a graphical session)" +} + exit_code_trustable () { true } |