aboutsummaryrefslogtreecommitdiffstats
path: root/match-trees.c
AgeCommit message (Expand)AuthorFilesLines
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani1-7/+4
2013-06-13match-trees: factor out fill_tree_desc_strictRené Scharfe1-25/+19
2013-03-25match-trees: simplify score_trees() using tree_entry()René Scharfe1-40/+28
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano1-1/+68
2007-10-21Improved const correctness for stringsShawn O. Pearce1-1/+1
2007-06-07War on whitespaceJunio C Hamano1-1/+0
2007-04-07A new merge stragety 'subtree'.Junio C Hamano1-0/+304