view tests/test-hgk @ 12045:1e8c7999af86

Fix merge-tools.checkconflicts

re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".

Now conflict markers inside the file are found, too.

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "hgk=" >> $HGRCPATH

hg init repo
cd repo
echo a > a
hg ci -Am adda
hg debug-cat-file commit 0