]> git.proxmox.com Git - libgit2.git/commit - src/win32/git2.rc
Merge pull request #1593 from ethomson/conflict_iterator
authorVicent Martí <vicent@github.com>
Fri, 24 May 2013 10:30:35 +0000 (03:30 -0700)
committerVicent Martí <vicent@github.com>
Fri, 24 May 2013 10:30:35 +0000 (03:30 -0700)
commit26ab6284b20a3709adc7641a52250f72df9257aa
tree7b0c2888c8a0036d370f93490c240af30dd78c65
parentf7ceef06eb5a3ad5fc8d58d0c849c0de2395a7cc
parent0e0108f73f83c7cedeaafd480fdcfe3cd6b69d1f
Merge pull request #1593 from ethomson/conflict_iterator

introduce git_conflict_iterator
include/git2/types.h