tests/test-diff-copy-depth

merge: simplify flag merging code slightly

#!/bin/sh

for i in aaa zzz; do
    hg init t
    cd t

    echo "-- With $i"

    touch file
    hg add file
    hg ci -m "Add"

    hg cp file $i
    hg ci -m "a -> $i"

    hg cp $i other-file
    echo "different" >> $i
    hg ci -m "$i -> other-file"

    hg cp other-file somename

    echo "Status":
    hg st -C
    echo
    echo "Diff:"
    hg diff -g
    echo

    cd ..
    rm -rf t
done