--- a/tests/test-graft.t Fri Mar 25 21:51:00 2016 +0000
+++ b/tests/test-graft.t Sat Mar 19 18:37:10 2016 -0700
@@ -452,7 +452,7 @@
c
=======
b
- >>>>>>> other: 5d205f8b35b6 - bar: 1
+ >>>>>>> graft: 5d205f8b35b6 - bar: 1
$ echo b > a
$ hg resolve -m a
(no more unresolved files)