view tests/test-merge3 @ 4416:bb1800a7d7e1

merge: fix spurious merges for copies in linear updates

We make better use of contexts to accurately identify copies that
don't need merges.

Add a simple test and update other tests.

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