diff options
Diffstat (limited to 'mergetools')
-rw-r--r-- | mergetools/vimdiff | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 9d1bf4f455..461a89b6f9 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -365,6 +365,25 @@ diff_cmd () { } +diff_cmd_help () { + TOOL=$1 + + case "$TOOL" in + nvimdiff*) + printf "Use Neovim" + ;; + gvimdiff*) + printf "Use gVim (requires a graphical session)" + ;; + vimdiff*) + printf "Use Vim" + ;; + esac + + return 0 +} + + merge_cmd () { layout=$(git config mergetool.vimdiff.layout) @@ -436,6 +455,40 @@ merge_cmd () { } +merge_cmd_help () { + TOOL=$1 + + case "$TOOL" in + nvimdiff*) + printf "Use Neovim " + ;; + gvimdiff*) + printf "Use gVim (requires a graphical session) " + ;; + vimdiff*) + printf "Use Vim " + ;; + esac + + case "$TOOL" in + *1) + echo "with a 2 panes layout (LOCAL and REMOTE)" + ;; + *2) + echo "with a 3 panes layout (LOCAL, MERGED and REMOTE)" + ;; + *3) + echo "where only the MERGED file is shown" + ;; + *) + echo "with a custom layout (see \`git help mergetool\`'s \`BACKEND SPECIFIC HINTS\` section)" + ;; + esac + + return 0 +} + + translate_merge_tool_path () { case "$1" in nvimdiff*) |