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
changeset 4361 46280c004f22
parent 3192 096f1c73cdc3
child 4659 7a7d4937272b 
--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+HGMERGE=true; export HGMERGE
+
 set -e
 mkdir r1
 cd r1
mercurial-crew-with-dirclash