summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
Commit message (Expand)AuthorAgeFilesLines
* merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplifyRené Scharfe2014-09-021-12/+6
* merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-1/+5
* merge-tree: fix typo in "both changed identically"John Keeping2013-04-281-1/+1
* merge-tree: don't print entries that match "local"John Keeping2013-04-081-13/+13
* merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
* merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-32/+40
* merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-4/+22
* merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
* merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
* Which merge_file() function do you mean?Junio C Hamano2012-12-091-2/+2
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-111-2/+1
* Fix sparse warningsStephen Boyd2011-03-221-1/+1
* merge-tree: fix where two branches share no changesWill Palmer2010-07-141-1/+2
* Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+358
View Lorry Controller Status