summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)Author
2008-07-16Merge branch 'mv/merge-in-c'Junio C Hamano
2008-07-10Teach merge.log to "git-merge" againJunio C Hamano
2008-07-08Build in mergeMiklos Vajna