Re: [PATCH] Automerge fix

> "LT" == Linus Torvalds <[EMAIL PROTECTED]> writes: LT> What's the right way? LT> Maybe LT> if merge "$src2" "$orig" "$src1" LT> then LT> cp "$src2" "$4" && update-cache --add -- "$4" && exit 0 LT> fi LT> echo Leaving conflict merge in $src2 LT> exit 1 LT>

Re: [PATCH] Automerge fix

Dear diary, on Tue, Apr 19, 2005 at 04:48:09AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > > git-merge-one-file-script: 7ebf5dac4c69043cd2ff89bf7ee552152802f8d1 > > --- a/git-merge-one-file-script > > +++ b/git-merge-one-file-script > > @@ -43,7 +43,7 @@ case "${

Re: [PATCH] Automerge fix

On Tue, 19 Apr 2005, Petr Baudis wrote: > > this patch fixes git-merge-one-file-script's automerge. Nope, it doesn't. The original may not have worked, but neither does your vesion either: the reason for the exit 1 is that the _script_ should exit, but when you put it in a sub-shell with (..)

[PATCH] Automerge fix

Hello, this patch fixes git-merge-one-file-script's automerge. Signed-off-by: Petr Baudis <[EMAIL PROTECTED]> git-merge-one-file-script: 7ebf5dac4c69043cd2ff89bf7ee552152802f8d1 --- a/git-merge-one-file-script +++ b/git-merge-one-file-script @@ -43,7 +43,7 @@ case "${1:-.}${2:-.}${3:-.}" in