Commit 9f664347ff74716dc35ff0bd9a1a87606ae29cf0

Edward Thomson 2014-11-06T14:40:21

checkout_index: remove conflicts when checking out new files