summaryrefslogtreecommitdiff
path: root/merge.c
AgeCommit message (Expand)AuthorFilesLines
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-0/+112