summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
AgeCommit message (Expand)AuthorFilesLines
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-2/+2
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.Libravatar brian m. carlson1-2/+2
2015-09-28react to errors in xdi_diffLibravatar Jeff King1-1/+2
2014-09-02merge-tree: remove unused df_conflict argumentsLibravatar René Scharfe1-12/+6
2013-05-06merge-tree: handle directory/empty conflict correctlyLibravatar John Keeping1-1/+5
2013-04-28merge-tree: fix typo in "both changed identically"Libravatar John Keeping1-1/+1
2013-04-08merge-tree: don't print entries that match "local"Libravatar John Keeping1-13/+13
2013-03-27merge-tree: fix typo in merge-tree.c::unresolvedLibravatar John Keeping1-1/+1
2012-12-26merge-tree: fix d/f conflictsLibravatar Junio C Hamano1-32/+40
2012-12-26merge-tree: add comments to clarify what these functions are doingLibravatar Junio C Hamano1-4/+22
2012-12-26merge-tree: lose unused "resolve_directories"Libravatar Junio C Hamano1-3/+0
2012-12-26merge-tree: lose unused "flags" from merge_listLibravatar Junio C Hamano1-2/+1
2012-12-09Which merge_file() function do you mean?Libravatar Junio C Hamano1-2/+2
2011-04-11sparse: Fix an "symbol 'merge_file' not decared" warningLibravatar Ramsay Jones1-2/+1
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