Commit e651e8e2b5c5eb021448fb0f0a36cb3f10fa9326

Edward Thomson 2014-01-19T15:05:08

Introduce diff3 mode for checking out conflicts