diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-19 18:12:22 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:13 -0500 |
| commit | 6891a862bbde86f9262c4b367effb1e29d7c513b (patch) | |
| tree | e7b4b3442554447b93a05fe4fda5c26a86597a95 /tests/diff/diffiter.c | |
| parent | e651e8e2b5c5eb021448fb0f0a36cb3f10fa9326 (diff) | |
| download | libgit2-6891a862bbde86f9262c4b367effb1e29d7c513b.tar.gz | |
Load merge.conflictstyle setting from config
Diffstat (limited to 'tests/diff/diffiter.c')
0 files changed, 0 insertions, 0 deletions