Mercurial > hg

log tests/test-merge-remove.t @ 23196:daa73289dd2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
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
Mon, 10 Feb 2014 00:43:54 +0100 Mads Kiilerich merge: don't overwrite file untracked after remove, abort with 'untracked files' stable
Sun, 12 Sep 2010 12:11:39 +0200 Adrian Buehlmann tests: unify test-merge-remove base tests/test-merge-remove@d4b54bb45926
less more | (0) tip