Commit 629b661caab321a3aa5ffd7274ea4ed441d2805e

Edward Thomson 2013-07-17T09:49:56

checkout (from index) can write conflicts