summaryrefslogtreecommitdiff
path: root/builtin-merge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-151-0/+1
* Teach merge.log to "git-merge" againJunio C Hamano2008-07-101-0/+2
* Build in mergeMiklos Vajna2008-07-071-0/+1153