[PATCH 2 of 5] merge: set _local/_other for conflictfree merges
timeless at gmail.com
Tue Mar 22 18:30:50 EDT 2016
farnz has convinced me that we don't want to do this commit at all.
I'm reworking the rest of this series.
More information about the Mercurial-devel