tests/test-conflict

convert: svn_sink: workaround of command line size limitation on win32.

On win32, the command line arguments seems to be limited about 2400
bytes.  So 'add', 'delete', 'propget' and 'propdel' operations are
called several times within this limitation.  And also 'commit'
operation is changed to be called without passing target files not to
exceeds this limitation because it cannot be a separated like other
operations above.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status