diff options
author | Ben Straub <bs@github.com> | 2014-02-05 14:10:19 -0800 |
---|---|---|
committer | Ben Straub <bs@github.com> | 2014-02-05 14:10:19 -0800 |
commit | 78ee7e81f59dc1e51551628f8f90ee58ea286cf8 (patch) | |
tree | 47acb689571e989258c354aeba3dcdcaadd41a31 /include/git2/commit.h | |
parent | 3094102f694cc7bdbe3572a35050fec3729b2870 (diff) | |
download | libgit2-78ee7e81f59dc1e51551628f8f90ee58ea286cf8.tar.gz |
More merge.conflictstyle fixes
Diffstat (limited to 'include/git2/commit.h')
0 files changed, 0 insertions, 0 deletions