summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
Commit message (Expand)AuthorAgeFilesLines
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+34