diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-05-08 15:41:36 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-05-27 20:49:16 -0500 |
| commit | d362093f9e858cf48d3c09bbcacf01f057b58db1 (patch) | |
| tree | 486b7c6bb8c4e6470c8b375c670c29abd279a98d /tests/diff/binary.c | |
| parent | 433ba614a2ef948008510a1b1189702d515d2fc4 (diff) | |
| download | libgit2-d362093f9e858cf48d3c09bbcacf01f057b58db1.tar.gz | |
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
Diffstat (limited to 'tests/diff/binary.c')
0 files changed, 0 insertions, 0 deletions