summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
AgeCommit message (Expand)AuthorFilesLines
2010-06-13Merge branch 'rs/diff-no-minimal'Libravatar Junio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+358