summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
AgeCommit message (Expand)Author
2011-04-11sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones
2011-03-22Fix sparse warningsStephen Boyd
2010-07-14merge-tree: fix where two branches share no changesWill Palmer
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds