view tests/test-merge3 @ 2953:3d5547845158

fix issue 322.
do not allow to add files that shadow files or directories already in dirstate.

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