mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a new merge strategy by Fredrik Kuivinen.

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-09-10 17:46:27 -07:00
parent 0f69be5376
commit 720d150c48
9 changed files with 741 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -14,7 +14,7 @@ usage () {
# all_strategies='resolve fredrik stupid octopus'
all_strategies='resolve octopus stupid'
all_strategies='fredrik octopus resolve stupid'
default_strategies='resolve octopus'
use_strategies=