# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1159601984 -7200
# Node ID f8e67b7c57a48cdde37d5cbe3f781ac80f756eb2
# Parent  1749987b29e39be405f8259a301febe5ed87cd45
Remove unneeded (and bashismic) export HGMERGE=true.

diff -r 1749987b29e3 -r f8e67b7c57a4 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