Merge branch 'mg/advice-statushints'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:02:23 +0000 (04:02 -0700)
commit82e7ee7351d6e328294016d3b99825d8001abd24
tree4940740a6f217d1c9f0abc415766a3a690e627fc
parentb7ef48d5d5f0d5b912a5ca84a7079803387586ae
parent980bde389491e65df3a6f26f755064013b65740c
Merge branch 'mg/advice-statushints'

* mg/advice-statushints:
  wt-status: take advice.statusHints seriously
  t7508: test advice.statusHints

Conflicts:
wt-status.c
t/t7508-status.sh
wt-status.c