When merge patching it will now detect if there is an unresolved conflict in
your current branch and exit without doing anything.
This is useful when merging multiple branches at once, if you hit a conflict
half way though it would remove the "MERGE_PATCH" file and lose where you where
in the patch
Now the script will exit and not lose the position so you can `--continue`
correctly after fixing the conflicts
f386272007