From: Junio C Hamano Date: Tue, 29 Jul 2008 23:43:53 GMT Subject: Re: [PATCH 3/4] Add a new test for using a custom merge strategy Message-ID: <7vabg09rye.fsf@gitster.siamese.dyndns.org> In-Reply-To: Miklos Vajna writes: > +cat > git-merge-theirs << EOF > +#!/bin/sh > +eval git read-tree --reset -u \\\$\$# > +EOF This should be $SHELL_PATH, instead of hardcoded /bin/sh, to be easy on people on Solaris and other systems. Other than that, the patch is good and there is no need to resend it. Thanks. By the way, this eval shows why "theirs" cannot be a symmetric operation of "ours". You are taking the last remote HEAD even when you are merging more than one remote into the current branch at once. "ours" can be sensibly defined for an octopus, but "theirs" has this "which theirs" problem ;-)