Comment 3 for bug 370741

The big issue here is not that the three way merge wasn't successful. It's that the installer fails to continue cleanly after the failure. it claims a failure and looks like it's trying to clean up when really it's sitting there with a blank terminal screen. I had to ctrl-c in the terminal and then it continued on (also unsuccessfully, but then it worked when I tried again).

The recovery from failure should be more graceful.