Commit 3acf44d6cb5e56fea379504c07ae7ac8dd0e586d

Edward Thomson 2013-07-17T09:43:32

tests for checkout index with conflicts