summaryrefslogtreecommitdiff
path: root/merge.c
Commit message (Expand)AuthorAgeFilesLines
* merge: use argv_array when spawning merge strategyJeff King2014-06-191-29/+13
* Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+112