From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:57 +0000 (-0700)
Subject: Merge branch 'rt/cherry-pick-continue-advice-in-status'
X-Git-Tag: v1.8.4-rc0~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=001d1160541a6dcfceb82a0a900478e315a129eb;p=git

Merge branch 'rt/cherry-pick-continue-advice-in-status'

* rt/cherry-pick-continue-advice-in-status:
  wt-status: give better advice when cherry-pick is in progress
---

001d1160541a6dcfceb82a0a900478e315a129eb