summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)AuthorFilesLines
2008-07-10Teach merge.log to "git-merge" againLibravatar Junio C Hamano1-0/+2
2008-07-07Build in mergeLibravatar Miklos Vajna1-0/+1153