On Fri, 28 Jun 2013, Sebastian Schuberth wrote:
> On Thu, Jun 27, 2013 at 8:52 PM, Johannes Schindelin
> <johannes.schinde...@gmx.de> wrote:
> >> --- a/git-merge-octopus.sh
> >> +++ b/git-merge-octopus.sh
> >> @@ -97,7 +97,7 @@ do
> >> if test $? -ne 0
> >> then
> >> 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 ...
I know. That is what I pointed out. git-merge-one-file was *not*
"un-dashed". And I explained the reason, too.
But if we really want to solve the problem you described earlier, we also
must not rely on git-merge-one-file to be present in libexec.
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