Merge pull request #3482 from ethomson/merge_fail_on_conflict merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT
2015-10-23T13:37:02