Commit 07bb8078cbea77e3d85bf087e2510c2e23d8fa29

Edward Thomson 2017-01-14T16:01:53

CHANGELOG: update `GIT_MERGE_OPTIONS_INIT` changes