Mercurial > hg
comparison hgext/record.py @ 21921:ecc1387138ba
filemerge: use non-minimal conflict marker regions (BC)
As extensively detailed by Pierre-Yves[1], simplemerge's minimal
markers can result in hopeless confusion for many common merges. As it
happens, we accidentally inherited this behavior when we borrowed
simplemerge from bzr; it is not the behavior used by RCS's merge(1),
Since merge(1) (and not bzr) is what we aim to emulate when emulating
RCS's merge markers, we simply turn this feature off. This brings us
in line with the behavior of CVS, SVN, and Git as a bonus.
(NB: using conflict markers with Mercurial is discouraged.)
[1] http://markmail.org/message/wj5mh3lc46czlvld
convert glob tessa
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 18 Jul 2014 21:49:52 -0500 |
parents | 23f3241406ff |
children | 75e7d4a0f135 |
comparison
equal
deleted
inserted
replaced
21920:1d04d3fe616d | 21921:ecc1387138ba |
---|