[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
authorFredrik Kuivinen <freku045@student.liu.se>
Tue, 13 Sep 2005 06:22:26 +0000 (08:22 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 07:20:54 +0000 (00:20 -0700)
commite4cf17c...0db2dab7c9525a732f86c5e3df3b4ed0
treee311046...26ff830a2232067e6ad00ba06db95e2dcopy hash to clipboard (tree)
parentf88ed17...e7a391bd907798ad2a3347a83cd24317copy hash to clipboard (diff)
.gitignore
Makefile
git-merge-fredrik.py [deleted file]
git-merge-recursive.py [new file with mode: 0755]
git-merge.sh