summaryrefslogtreecommitdiff
path: root/merge.c
AgeCommit message (Expand)AuthorFilesLines
2014-06-19merge: use argv_array when spawning merge strategyLibravatar Jeff King1-29/+13
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-0/+112