Commit eff531e1034401b144b02ff2913a361669d04129

Edward Thomson 2014-05-27T20:58:20

Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE