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