summaryrefslogtreecommitdiffstats
path: root/match-trees.c (follow)
AgeCommit message (Expand)AuthorFilesLines
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