git.verplant.org Git - git.git/commit

author	Junio C Hamano <junkio@cox.net>
	Sun, 11 Sep 2005 00:46:27 +0000 (17:46 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Sun, 11 Sep 2005 02:46:53 +0000 (19:46 -0700)
commit	720d150c48fc35fca13c6dfb3c76d60e4ee83b87
tree	7b6a98c985a6bc2f5e0a66c3ea15ac0a0e081269	tree \| snapshot
parent	0f69be537618036c45bc07919248b88afbf7af3e	commit \| diff

Add a new merge strategy by Fredrik Kuivinen.

I really wanted to try this out, instead of asking for an adjustment
to the 'git merge' driver and waiting. For now the new strategy is
called 'fredrik' and not in the list of default strategies to be tried.

The script wants Python 2.4 so this commit also adjusts Debian and RPM
build procecure files.

Signed-off-by: Junio C Hamano <junkio@cox.net>

.gitignore		diff \| blob \| history
Makefile		diff \| blob \| history
debian/control		diff \| blob \| history
debian/rules		diff \| blob \| history
git-core.spec.in		diff \| blob \| history
git-merge-fredrik.py	[new file with mode: 0755]	blob
git-merge.sh		diff \| blob \| history
gitMergeCommon.py	[new file with mode: 0644]	blob
read-tree.c		diff \| blob \| history

The core git plumbing

RSS Atom