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-annotate
changeset 3195 f8e67b7c57a4
parent 3165 5c93dd0ae413
child 3404 2e1d8b238b6c 
--- a/tests/test-annotate
+++ b/tests/test-annotate
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-export HGMERGE=true
-
 echo % init
 hg init
mercurial-crew-with-dirclash