Mercurial > hg-stable
graph
-
dirstate: merge falls through to otherparentSat, 11 Oct 2014 14:05:09 -0500, by Matt Mackall
-
dirstate: use 'm' state in otherparent to reduce ambiguityFri, 10 Oct 2014 13:31:06 -0500, by Matt Mackall
-
dirstate: properly clean-up some more merge state on setparentsFri, 10 Oct 2014 13:05:50 -0500, by Matt Mackall