aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
Commit message (Expand)AuthorAge
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-11
* Fix sparse warningsStephen Boyd2011-03-22
* merge-tree: fix where two branches share no changesWill Palmer2010-07-14
* Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-21
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22