Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unneeded (and bashismic) export HGMERGE=true.
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 30 Sep 2006 09:39:44 +0200
changeset 3195 f8e67b7c57a4
parent 3194 1749987b29e3
child 3203 14792adabf80
Remove unneeded (and bashismic) export HGMERGE=true.
tests/test-annotate file | annotate | diff | comparison | revisions 
--- 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