Commit 63e8c3fde26c20c36c3d850d48e1d94a437318cf

Vicent Marti 2014-05-28T13:47:55

Merge pull request #2337 from ethomson/merge_ff Introduce GIT_MERGE_CONFIG_* for merge.ff settings