run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

#!/bin/sh

echo '[Section]' >> $HGRCPATH
echo 'KeY = Case Sensitive' >> $HGRCPATH
echo 'key = lower case' >> $HGRCPATH

hg showconfig