summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+358