summaryrefslogtreecommitdiffstats
path: root/builtin/merge-tree.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+358