summaryrefslogtreecommitdiff
path: root/merge.c
Commit message (Expand)AuthorAgeFilesLines
* read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-4/+3
* Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+112