aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
Commit message (Expand)AuthorAge
* Merge branch 'cc/cherry-pick-ff'Junio C Hamano2010-03-28
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22