view tests/test-merge3 @ 3400:d2b55e3c4e25

merge: if filemerge skips merge, report as updated

#!/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"