summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-201-9/+14
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+96