Merge branch 'rt/cherry-pick-continue-advice-in-status'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:57 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:57 +0000 (13:48 -0700)
* rt/cherry-pick-continue-advice-in-status:
wt-status: give better advice when cherry-pick is in progress

Trivial merge