Merge branch 'rt/cherry-pick-continue-advice-in-status'
commit001d1160541a6dcfceb82a0a900478e315a129eb
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:57 +0000 (24 13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:57 +0000 (24 13:48 -0700)
treebf35a1f9ac9be44976dd4e97d4450f98daceb286
parent869577e5fe8d4307dd39d2751cf3c5a1896d3426
parentb95e66f507967fdfbf7275a94729fe09aa4b20ca
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