Commit 2d24816b4611a7392617855f497f81f385092f34

Edward Thomson 2014-11-06T18:49:37

checkout_index: Remove stage 0 when checking out conflicts