Patch Set 2:

Right, but first of all I wanted to get rid of the ugly exception from the summary. So, the most important change is to catch the exception thrown by dco.checkout() in MergeCommand.call() once #setFailOnConflict is set to true. It's line 184 with the patch applied. Sorry, I should have wrote few lines describing the change.