changeset 21267 | e4f451c8c05c |
parent 21266 | 19d6fec60b81 |
child 21947 | b081decd9062 |
--- a/tests/test-lfconvert.t Fri Apr 18 22:19:25 2014 -0700 +++ b/tests/test-lfconvert.t Fri May 09 14:46:50 2014 -0500 @@ -132,7 +132,7 @@ [1] $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat $ hg resolve -m stuff/maybelarge.dat - no unresolved files; you may continue your unfinished operation + no more unresolved files $ hg commit -m"merge" $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n" @ 5:4884f215abda merge