hgmerge: logic changes Details: - keep automatic merge conflicts in $LOCAL - do not assume that $EDITOR returns proper error code - fix a slight mistake in diff+patch merge success detection (it could succeed if the $EDITOR failed to run)

#!/bin/sh

hg init a
cd a
echo a > foo
hg add foo
hg commit -m 1 -d "0 0"
rm foo
hg remove foo
hg commit -m 2 -d "0 0"
hg export 0
hg export 1
hg log -p -r 0
hg log -p -r 1

cd ..
hg clone a b