Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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.out
changeset 748 c5df1a9c5276
parent 591 eb46971fc57f
child 749 7e4843b7efd2 
--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -20,5 +20,5 @@ something else
 =======
 something
 + hg status
-C a
+M a
 ? .out
mercurial-crew-with-dirclash