Commit 2f1080ea04ad1235efcd4b213dbe3a1b847644f7

Edward Thomson 2015-05-19T11:17:07

conflict tests: use GIT_IDXENTRY_STAGE_SET