--- a/tests/test-tag.t Thu Jan 04 21:37:03 2018 -0800
+++ b/tests/test-tag.t Mon Jan 08 19:41:47 2018 +0530
@@ -708,7 +708,7 @@
the following 1 tags are in conflict: t7
automatic tag merging of .hgtags failed! (use 'hg resolve --tool :merge' or another merge tool of your choice)
2 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+ use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve -l
U .hgtags