summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-111-2/+1
* Fix sparse warningsStephen Boyd2011-03-221-1/+1
* merge-tree: fix where two branches share no changesWill Palmer2010-07-141-1/+2
* Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+358