
Oct. 23, 2011
2:57 p.m.
Hi,
for those of you who also miss the seeing base revision in merge conflict markers sometimes, I recently saw this post on mercurial-devel:
http://comments.gmane.org/gmane.comp.version-control.mercurial.devel/45022
There is a reason why it is not the default behavior: mercurial collapses conflict regions when local and other have changed a few lines identically; this is not possible with 3-way markers.
Georg
4895
Age (days ago)
4895
Last active (days ago)
0 comments
1 participants
participants (1)
-
Georg Brandl