Merge commit 'sg/merge-options^' into jk/renamelimit
[gitweb.git] / test-match-trees.c
2007-04-07 A new merge stragety 'subtree'.