aboutsummaryrefslogtreecommitdiff
path: root/match-trees.c
Commit message (Expand)AuthorAge
* match-trees: factor out fill_tree_desc_strictRené Scharfe2013-06-13
* match-trees: simplify score_trees() using tree_entry()René Scharfe2013-03-25
* Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-17
* Improved const correctness for stringsShawn O. Pearce2007-10-21
* War on whitespaceJunio C Hamano2007-06-07
* A new merge stragety 'subtree'.Junio C Hamano2007-04-07