Carlos Martín Nieto 8321596a49 Merge pull request #3444 from ethomson/add_preserves_conflict_mode ... Preserve modes from a conflict in `git_index_insert`		2015-10-15 12:22:10 +02:00
..
git2	Merge pull request #3444 from ethomson/add_preserves_conflict_mode	2015-10-15 12:22:10 +02:00
git2.h	Include git2/transaction.h	2015-05-31 19:22:12 +02:00