On Thu, Jun 27, 2013 at 8:52 PM, Johannes Schindelin
>> --- a/git-merge-octopus.sh
>> +++ b/git-merge-octopus.sh
>> @@ -97,7 +97,7 @@ do
>> if test $? -ne 0
>> echo "Simple merge did not work, trying automatic merge."
>> - git-merge-index -o git-merge-one-file -a ||
>> + git merge-index -o git-merge-one-file -a ||
> This is a problem. 'git-merge-one-file' cannot be split here AFAICT.
> Of course, we could teach merge-index to read *two* parameters instead of
> one when it encounters "git" as the <merge-program>. But that would be as
> hacky as the whole dashed-form business to begin with.
I agree to all of your comments except this one: I did not split
'git-merge-one-file' here ...
>> diff --git a/git-merge-resolve.sh b/git-merge-resolve.sh
>> index c9da747..343fe7b 100755
>> --- a/git-merge-resolve.sh
>> +++ b/git-merge-resolve.sh
>> @@ -45,7 +45,7 @@ then
>> exit 0
>> echo "Simple merge failed, trying Automatic merge."
>> - if git-merge-index -o git-merge-one-file -a
>> + if git merge-index -o git-merge-one-file -a
> As above, with -octopus.
Sorry, I can't follow you here.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html