A new merge stragety 'subtree'.
authorJunio C Hamano <junkio@cox.net>
Fri, 16 Feb 2007 00:32:45 +0000 (16:32 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 09:29:40 +0000 (02:29 -0700)
commit68faf68...38ee943fc251c702f2027e4dfda354db
tree52edea6...a7497c5ed566620172c1a0cc50cc59d4copy hash to clipboard (tree)
parentee9693e...46669f48f6b058a1044cefa973a44c22copy hash to clipboard (diff)
.gitignore
Makefile
cache.h
git-merge.sh
match-trees.c [new file with mode: 0644]
merge-recursive.c
test-match-trees.c [new file with mode: 0644]