summaryrefslogtreecommitdiff
path: root/builtin/merge.c
AgeCommit message (Expand)AuthorFilesLines
2010-03-28Merge branch 'cc/cherry-pick-ff'Libravatar Junio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+1292