From: Jeff King <peff@peff.net>
Date: Fri, 21 Oct 2011 17:35:28 GMT
Subject: Re: [PATCH 2/3] contrib: add git-jump script
Message-ID: <20111021173528.GA24406@sigill.intra.peff.net>
In-Reply-To: <20111021172804.GB24417@sigill.intra.peff.net>

On Fri, Oct 21, 2011 at 01:28:04PM -0400, Jeff King wrote:

> Subject: [PATCH 2/3] contrib: add git-jump script
> [...]
> This fixes a minor bug in v1 where doing "git jump merge" would display
> the usage message when there were unmerged files, but none of the files
> contained conflict markers (i.e., you had already fixed them up).

Oops, the subject should read "PATCHv2", obviously.

-Peff