view tests/test-merge3 @ 5032:6dbd40b6307c

Update expected test output

It's no longer a "problem" to have the same name listed with no prefix
and a "hgext." prefix.

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