aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
Commit message (Expand)AuthorAge
* Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-20
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22