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)

abort: repository a not found!
255
requesting all changes
abort: error: Connection refused
255
abort: repository a not found!
255
abort: destination '../a' already exists
1
abort: repository a not found!
255
abort: destination 'q' already exists