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 591 eb46971fc57f
parent 547 4fc63e22b1fe
child 619 d96c1153b25d 
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -25,7 +25,7 @@ diff -r c19d34741b0a a
 + hg -q pull ../r1
 + hg status
 C a
-+ hg -d up
++ hg --debug up
 resolving manifests
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
@@ -34,7 +34,7 @@ getting b
 merging a
 resolving a
 file a: other d730145abbf9 ancestor b789fdd96dc2
-+ hg -d up -m
++ hg --debug up -m
 resolving manifests
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
mercurial-crew-with-dirclash