branch | stable |
changeset 21947 | b081decd9062 |
parent 21877 | dbbae63865a6 |
child 21966 | be94ed4baa5d |
--- a/tests/test-log.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-log.t Sat Jul 26 03:32:49 2014 +0200 @@ -1027,7 +1027,7 @@ [1] $ echo 'merge 1' > foo $ hg resolve -m foo - no more unresolved files + (no more unresolved files) $ hg ci -m "First merge, related" $ hg merge 4 @@ -1039,7 +1039,7 @@ [1] $ echo 'merge 2' > foo $ hg resolve -m foo - no more unresolved files + (no more unresolved files) $ hg ci -m "Last merge, related" $ hg log --graph