summaryrefslogtreecommitdiff
path: root/builtin-merge-index.c
Commit message (Expand)AuthorAgeFilesLines
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-111/+0
* make "merge-index" a built-inLinus Torvalds2010-01-221-0/+111