summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
AgeCommit message (Expand)AuthorFilesLines
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2010-07-14merge-tree: fix where two branches share no changesLibravatar Will Palmer1-1/+2
2010-06-21Merge branch 'rs/diff-no-minimal' into maintLibravatar Junio C Hamano1-1/+1
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+358