branch | compat-hg2.3 |
changeset 620 | 232536f5c987 |
parent 593 | 26f76b38f879 |
child 625 | e291e5271694 |
child 644 | 8e41d5b78dff |
--- a/tests/test-evolve.t Mon Nov 26 11:59:40 2012 +0100 +++ b/tests/test-evolve.t Thu Nov 22 11:30:36 2012 +0100 @@ -575,7 +575,6 @@ $ hg log -r 11 --template '{desc}\n' add 1 - *** conflict $ hg debugrebuildstate @@ -598,15 +597,12 @@ $ hg log -r 12 --template '{desc}\n' add 4 - *** add 3 - *** add 1 - *** conflict $ hg debugrebuildstate