summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
Commit message (Expand)AuthorAgeFilesLines
* Fix sparse warningsStephen Boyd2011-03-221-2/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+111