Sam Deane

Sam Deane

@pilky do you use Kaleidoscope. I find that it can sometimes to a better job of the merge than git itself can.