log tests/test-issue522.t @ 23513:4c7ea2d9bad9

age author description
Fri, 10 Oct 2014 13:31:06 -0500 Matt Mackall dirstate: use 'm' state in otherparent to reduce ambiguity
Sat, 09 Feb 2013 15:22:04 -0800 Bryan O'Sullivan tests: update test output (will be folded into parent)
Fri, 08 Feb 2013 15:23:23 +0000 Siddharth Agarwal manifestmerge: pass in branchmerge and force separately
Wed, 11 Jul 2012 15:03:10 -0700 Bryan O'Sullivan tests: reduce spurious failures when run with generaldelta
Fri, 09 Dec 2011 17:34:53 +0100 Martin Geisler merge: make debug output easier to read
Wed, 04 May 2011 13:37:41 +0200 Sune Foldager tests: fix deprecated use of hg debugdata/debugindex
Fri, 17 Sep 2010 17:03:08 -0500 Matt Mackall tests: fix a bunch of pointless #s in unified tests
Fri, 03 Sep 2010 23:34:37 +0200 Adrian Buehlmann tests: unify test-issue* base tests/test-issue522@c85e096e4ff3