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/opendiff | |
| parent | c237c3fd5f038802f3d390c2e1aba9d0fd2f1fd9 (diff) | |
| parent | 980145f7470e20826ca22d7343494712eda9c81d (diff) | |
| download | git-123dfdff0d6e886ce5536d39dd77dcd46db8d4c0.tar.xz | |
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/opendiff')
| -rw-r--r-- | mergetools/opendiff | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mergetools/opendiff b/mergetools/opendiff index b608dd6de3..44adf8f951 100644 --- a/mergetools/opendiff +++ b/mergetools/opendiff @@ -2,6 +2,10 @@ diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" | cat } +diff_cmd_help () { + echo "Use FileMerge (requires a graphical session)" +} + merge_cmd () { if $base_present then @@ -12,3 +16,7 @@ merge_cmd () { -merge "$MERGED" | cat fi } + +merge_cmd_help () { + echo "Use FileMerge (requires a graphical session)" +} |