path: root/builtin/merge-tree.c
AgeCommit message (Expand)Author
2016-04-25struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson
2016-02-22use xmallocz to avoid size arithmeticJeff King
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-11-20Add several uses of get_object_hash.brian m. carlson
2015-09-28react to errors in xdi_diffJeff King
2014-09-02merge-tree: remove unused df_conflict argumentsRené Scharfe
2013-05-07merge-tree: handle directory/empty conflict correctlyJohn Keeping
2013-04-28merge-tree: fix typo in "both changed identically"John Keeping
2013-04-08merge-tree: don't print entries that match "local"John Keeping
2013-03-27merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping
2012-12-26merge-tree: fix d/f conflictsJunio C Hamano
2012-12-26merge-tree: add comments to clarify what these functions are doingJunio C Hamano
2012-12-26merge-tree: lose unused "resolve_directories"Junio C Hamano
2012-12-26merge-tree: lose unused "flags" from merge_listJunio C Hamano
2012-12-10Which merge_file() function do you mean?Junio C Hamano
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