Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-annotate @ 3195:f8e67b7c57a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unneeded (and bashismic) export HGMERGE=true.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 30 Sep 2006 09:39:44 +0200
parents 5c93dd0ae413
children 2e1d8b238b6c
line wrap: on
line diff
--- a/tests/test-annotate
+++ b/tests/test-annotate
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-export HGMERGE=true
-
 echo % init
 hg init