Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.t
changeset 38965 cf68e2649e0a
parent 38341 50f5fc232c16
child 39707 5abc47d4ca6b 
--- a/tests/test-conflict.t	Thu Aug 09 12:20:28 2018 +0300
+++ b/tests/test-conflict.t	Thu Aug 09 12:32:11 2018 +0300
@@ -58,7 +58,7 @@
   # To mark files as resolved:  hg resolve --mark FILE
   
   # To continue:    hg commit
-  # To abort:       hg update --clean . (warning: this will discard uncommitted changes)
+  # To abort:       hg merge --abort
   
 
   $ cat a
mercurial