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-up-local-change.out
changeset 748 c5df1a9c5276
parent 705 574869103985
child 749 7e4843b7efd2 
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -24,7 +24,7 @@ diff -r c19d34741b0a a
 + cd ../r2
 + hg -q pull ../r1
 + hg status
-C a
+M a
 + hg --debug up
 resolving manifests
  force None allow None moddirstate True linear True
mercurial-crew-with-dirclash