branch | stable |
changeset 21947 | b081decd9062 |
parent 21267 | e4f451c8c05c |
child 22316 | 816be4ca4ae2 |
--- a/tests/test-lfconvert.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-lfconvert.t Sat Jul 26 03:32:49 2014 +0200 @@ -132,7 +132,7 @@ [1] $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat $ hg resolve -m stuff/maybelarge.dat - no more unresolved files + (no more unresolved files) $ hg commit -m"merge" $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" @ 5:4884f215abda merge