Mercurial > hg
log
age | author | description |
---|---|---|
Sat, 11 Oct 2014 14:05:09 -0500 | Matt Mackall | dirstate: merge falls through to otherparent |
Fri, 10 Oct 2014 13:31:06 -0500 | Matt Mackall | dirstate: use 'm' state in otherparent to reduce ambiguity |
Fri, 10 Oct 2014 13:05:50 -0500 | Matt Mackall | dirstate: properly clean-up some more merge state on setparents |
Tue, 07 Oct 2014 11:42:37 -0700 | Durham Goode | phases: move root phase assignment to it's own function |