Add a new merge strategy by Fredrik Kuivinen.
authorJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 00:46:27 +0000 (17:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 11 Sep 2005 02:46:53 +0000 (19:46 -0700)
commit720d150...48fc35fca13c6dfb3c76d60e4ee83b87
tree7b6a98c...85a6bc2f5e0a66c3ea15ac0a0e081269copy hash to clipboard (tree)
parent0f69be5...7618036c45bc07919248b88afbf7af3ecopy hash to clipboard (diff)
.gitignore
Makefile
debian/control
debian/rules
git-core.spec.in
git-merge-fredrik.py [new file with mode: 0755]
git-merge.sh
gitMergeCommon.py [new file with mode: 0644]
read-tree.c