--- a/tests/test-keyword.t Sun Dec 21 12:53:57 2014 +0000
+++ b/tests/test-keyword.t Sun Dec 21 13:02:59 2014 +0000
@@ -1062,13 +1062,13 @@
foo
>>>>>>> other: 85d2d2d732a5 - test: simplemerge
-resolve to local
+resolve to local, m must contain hash of last change (local parent)
$ hg resolve -t internal:local -a
(no more unresolved files)
$ hg commit -m localresolve
$ cat m
- $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $
+ $Id: m 88a80c8d172e Thu, 01 Jan 1970 00:00:00 +0000 test $
bar
Test restricted mode with transplant -b