view tests/test-merge3 @ 8475:caaf1e779b37

templater: replace regex complexity by simple str containment checks

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"