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)
%% Should show unknown? unknown%% Should show unknown and b removed! b? unknown%% Should show a and unknownaunknown