branch | stable |
changeset 21947 | b081decd9062 |
parent 21789 | 15baed3f24ee |
child 22589 | 9ab18a912c44 |
--- a/tests/test-keyword.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-keyword.t Sat Jul 26 03:32:49 2014 +0200 @@ -1057,7 +1057,7 @@ resolve to local $ HGMERGE=internal:local hg resolve -a - no more unresolved files + (no more unresolved files) $ hg commit -m localresolve $ cat m $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $