Remove unneeded (and bashismic) export HGMERGE=true.
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 30 Sep 2006 09:39:44 +0200
changeset 3202 f8e67b7c57a4
parent 3201 1749987b29e3
child 3203 14792adabf80
Remove unneeded (and bashismic) export HGMERGE=true.
tests/test-annotate
--- a/tests/test-annotate	Fri Sep 29 18:17:29 2006 -0700
+++ b/tests/test-annotate	Sat Sep 30 09:39:44 2006 +0200
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-export HGMERGE=true
-
 echo % init
 hg init