From: Philippe Blain Date: Thu, 25 Feb 2021 18:45:16 GMT Subject: Re: [PATCH 0/1] mergetools/vimdiff: add vimdiff1 merge tool variant Message-ID: In-Reply-To: <20210214022840.849312-1-seth@eseth.com> Hi Seth, Le 2021-02-13 à 21:28, Seth House a écrit : > Add yet another vimdiff layout variant to present the simplest possible > two-way diff when resolving conflicts. > > The name is an attempt at UNIX-style humor -- vimdiff3 opens four > buffers and vimdiff2 opens three buffers so vimdiff1 should therefore > open two buffers. It also communicates that vimdiff will be used and > fits cleanly into the existing layout variant naming. That said, > suggestions welcome if that isn't as great a fit as I think it is. :) I like the name :P Slightly orthogonal though, when I first looked at the output of 'git mergetool --tool-help', I was sort of confused by vimdiff2 and vimdiff3 (and some others) because I looked for them in PATH and (of course) could not find them, still Git was telling me they were available. I think it would be good to add a short note about these variants somewhere in Documentation/git-mergetool.txt. Might be in this patch, or not if you don't feel like it... Going further, we could even add a short (few words) description of each tool and have that description show up in the output of 'git mergetool --tool-help', something like this: $ git mergetool --tool-help 'git mergetool --tool=' may be set to one of the following: emerge Emacs (Emerge) opendiff Apple FileMerge vimdiff Vim (??) vimdiff2 Vim (3 panes) vimdiff3 Vim (4 panes) Cheers, Philippe.