libgit2/libgit2 — pull request #2337 by ethomson (2014-05-08 22:44:00+00:00)
Title: Introduce GIT_MERGE_CONFIG_* for merge.ff settings

`git_merge_analysis` will now analyze the configuration as well, and return `GIT_MERGE_CONFIG_NO_FASTFORWARD` when `merge.ff=false` and `GIT_MERGE_CONFIG_FASTFORWARD_ONLY` when `merge.ff=true`