diff options
author | Vicent Marti <vicent@github.com> | 2014-05-28 13:47:55 +0200 |
---|---|---|
committer | Vicent Marti <vicent@github.com> | 2014-05-28 13:47:55 +0200 |
commit | 63e8c3fde26c20c36c3d850d48e1d94a437318cf (patch) | |
tree | 0e2eed2ab33d565c09a848d3af552959877a4bef /tests/diff/binary.c | |
parent | 433ba614a2ef948008510a1b1189702d515d2fc4 (diff) | |
parent | eff531e1034401b144b02ff2913a361669d04129 (diff) | |
download | libgit2-63e8c3fde26c20c36c3d850d48e1d94a437318cf.tar.gz |
Merge pull request #2337 from ethomson/merge_ff
Introduce GIT_MERGE_CONFIG_* for merge.ff settings
Diffstat (limited to 'tests/diff/binary.c')
0 files changed, 0 insertions, 0 deletions