From 720d150c48fc35fca13c6dfb3c76d60e4ee83b87 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 10 Sep 2005 17:46:27 -0700 Subject: 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 --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index f42b7e8f7a..be9ea5fa9c 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ git-mailinfo git-mailsplit git-merge git-merge-base +git-merge-fredrik git-merge-index git-merge-octopus git-merge-one-file -- cgit v1.2.3