Comment 1 for bug 385879

Adrian,

If you get a chance, please give the linked branch a *quick* test and let me know if it improves things. (I've done next to no testing on the branch but I think/hope it's in the right direction.)

If it proves successful, I'd be curious as to how many edge cases it solve. As well as update, it might also fix similar problems with merge and pull? And for good measure, hopefully it does the "right thing" w.r.t. generation of conflict-related files (x.THIS, x.OTHER, x.BASE)?