changeset 21266 | 19d6fec60b81 |
parent 18648 | 76b69cccb07a |
child 21267 | e4f451c8c05c |
--- a/tests/test-keyword.t Fri Apr 18 18:56:26 2014 -0700 +++ b/tests/test-keyword.t Fri Apr 18 22:19:25 2014 -0700 @@ -1058,6 +1058,7 @@ resolve to local $ HGMERGE=internal:local hg resolve -a + no unresolved files; you may continue your unfinished operation $ hg commit -m localresolve $ cat m $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $