aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
Commit message (Expand)AuthorAge
* react to errors in xdi_diffJeff King2015-09-28
* merge-tree: remove unused df_conflict argumentsRené Scharfe2014-09-02
* merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-06
* merge-tree: fix typo in "both changed identically"John Keeping2013-04-28
* merge-tree: don't print entries that match "local"John Keeping2013-04-08
* merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-27
* merge-tree: fix d/f conflictsJunio C Hamano2012-12-26
* merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-26
* merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-26
* merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-26
* Which merge_file() function do you mean?Junio C Hamano2012-12-09
* 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
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 04:30:38 +0000