Fixed permissions on template directories.
travis: build on osx too
index: check for valid filemodes on add
Address style concerns in setting mkdir/copy flags.
Fix compile error on Visual Studio
Introduce GIT_MERGE_CONFIG_* for merge.ff settings

git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD
when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when
merge.ff=true
Move GIT_MERGE_CONFIG_* to its own enum
Use a config snapshot
Staticify `merge_config`
Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE
Merge pull request #2337 from ethomson/merge_ff

Introduce GIT_MERGE_CONFIG_* for merge.ff settings
Merge pull request #2385 from karipe/development

Fix compile error on Visual Studio
Merge pull request #2359 from e45lee/chmod-fix

Fixed permissions on template directories.
Merge pull request #2377 from libgit2/cmn/dual-os

travis: build on osx too
Merge pull request #2380 from libgit2/cmn/index-add-modes

index: check for valid filemodes on add