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)
adding fooadding bombadding a.cadding dir/a.oadding dir/b.o! a.c! dir/a.o! dir/b.o? .hgignorea.c: unsupported file type (type is fifo)! a.c