diff options
author | Vicent Martà <vicent@github.com> | 2013-05-24 03:30:35 -0700 |
---|---|---|
committer | Vicent Martà <vicent@github.com> | 2013-05-24 03:30:35 -0700 |
commit | 26ab6284b20a3709adc7641a52250f72df9257aa (patch) | |
tree | 7b0c2888c8a0036d370f93490c240af30dd78c65 /include/git2/commit.h | |
parent | f7ceef06eb5a3ad5fc8d58d0c849c0de2395a7cc (diff) | |
parent | 0e0108f73f83c7cedeaafd480fdcfe3cd6b69d1f (diff) | |
download | libgit2-26ab6284b20a3709adc7641a52250f72df9257aa.tar.gz |
Merge pull request #1593 from ethomson/conflict_iterator
introduce git_conflict_iterator
Diffstat (limited to 'include/git2/commit.h')
0 files changed, 0 insertions, 0 deletions