comparison tests/test-annotate @ 3195:f8e67b7c57a4

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
comparison
equal deleted inserted replaced
3194:1749987b29e3 3195:f8e67b7c57a4
1 #!/bin/sh 1 #!/bin/sh
2
3 export HGMERGE=true
4 2
5 echo % init 3 echo % init
6 hg init 4 hg init
7 5
8 echo % commit 6 echo % commit