Proposal: discourage packagers from enabling merge-tool configs

Jordi GutiƩrrez Hermoso jordigh at octave.org
Wed Mar 11 10:33:02 CDT 2015


On Wed, 2015-03-11 at 11:12 -0400, Augie Fackler wrote:
> 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?

On the other hand, I think just leaving conflict markers in the files
results in newbies in the conflict markers getting comitted. Fixing a
bad merge then is difficult.

I think a better situation is what thg does on the Windows
distribution: bundle a sensible merge tool like kdiff3 and use it by
default.

I like having merge tools enabled by default. The problem is that
gvimdiff is a very arcane tool. The situation has gotten a bit better
for me recently with a gvimdiff message that says how to get out of
gvimdiff without doing anything.




More information about the Mercurial-devel mailing list