Implement merging of index entries.#503
Merged
jdavid merged 1 commit intolibgit2:masterfrom Mar 13, 2015
pks-t:bare-conflicts
Merged
Implement merging of index entries.#503jdavid merged 1 commit intolibgit2:masterfrom pks-t:bare-conflicts
jdavid merged 1 commit intolibgit2:masterfrom
pks-t:bare-conflicts