From: Elijah Newren <newren@gmail.com>
Date: Wed, 08 Apr 2009 18:38:06 GMT
Subject: Re: need help with git show :1:...
Message-ID: <51419b2c0904081138o3f05a6fm6a4213e7b0f1db6f@mail.gmail.com>
In-Reply-To: <7685.1239215733@relay.known.net>

Hi,

On Wed, Apr 8, 2009 at 12:35 PM, layer <layer@known.net> wrote:
<snip>
>>> git merge-file current-sock other-sock base-sock
>
> Did you mean this?
>
>  git merge-file current-sock base-sock other-sock
>
> The man page seems to indicate that.

Oops, yeah, current then base then other, like the manpage says.