# HG changeset patch # User Thomas Arendsen Hein # Date 1159601984 -7200 # Node ID f8e67b7c57a48cdde37d5cbe3f781ac80f756eb2 # Parent 1749987b29e39be405f8259a301febe5ed87cd45 Remove unneeded (and bashismic) export HGMERGE=true. diff --git a/tests/test-annotate b/tests/test-annotate --- a/tests/test-annotate +++ b/tests/test-annotate @@ -1,7 +1,5 @@ #!/bin/sh -export HGMERGE=true - echo % init hg init