Seth House <seth@xxxxxxxxx> writes: > On Thu, Feb 25, 2021 at 01:45:16PM -0500, Philippe Blain wrote: >> 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=<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) > > Great suggestions, thanks. A little explanation would be very helpful -- > I've been confused by those variants too and wondered why I might want > to use one over another. > > I'll roll those into this patch. I'd rather see it as a completely separate patch.
