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. :) Seth House (1): mergetools/vimdiff: add vimdiff1 merge tool variant mergetools/vimdiff | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.29.2
