Return to the prompt after a merge

If I decided to abandon a merge, a natural thing to try would be to simply exit the merge tool.  However, in this circumstance, ```rpmconf``` would assume that the merge was successful and quietly delete the .rpmnew file.

This change causes the prompt to be revisited after each merge, allowing the user to confirm what they want to do.