summaryrefslogtreecommitdiff
path: root/merge.c
AgeCommit message (Expand)Author
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy