Proposal: discourage packagers from enabling merge-tool configs

Matt Mackall mpm at selenic.com
Wed Mar 11 14:02:39 CDT 2015


On Wed, 2015-03-11 at 11:12 -0400, Augie Fackler wrote:
> From IRC just now:
> > 11:07 < newdan> durin42, well yesterday I had some help figuring out how to 
> >                 make rebase work more like git when conflicts happen (by 
> >                 default on my box it opens up gvimdiff which I don't know, and 
> >                 :qall-ing out made me actually lose some of my work)

Gvimdiff, like every program with 'vi' in its name, is an abomination, I
think we can all agree..

> This has burned me too. I believe our current position is that we
> think packagers should enable all the merge tools. I think that's
> dangerous for the above reason. Can we change that to recommend
> including it as a documentation sample, but to not enable them by
> default?

..but this may be _the single largest end-user regression ever proposed
on this list_. Really, you want to break everyone's merge setup, not
just the poor bastards with vim on their systems?

Vimdiff now explains how to properly quit, at a minimum we need to fix gvimdiff to do the same:

vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \
\":cq\" to abort vimdiff"'

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list