branch | stable |
changeset 21947 | b081decd9062 |
parent 21712 | 51035af2c0bf |
child 23615 | 7cfe58983bff |
--- a/tests/test-backout.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-backout.t Sat Jul 26 03:32:49 2014 +0200 @@ -517,7 +517,7 @@ merging foo my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 premerge successful - no more unresolved files + (no more unresolved files) $ hg status M foo ? foo.orig