Merge branch 'mg/advice-statushints' into next
commit4642509aae15f12576d07ac34c3e988e0aaa2727
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 22:28:14 +0000 (9 15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 22:28:14 +0000 (9 15:28 -0700)
tree9248e98f86eb4dad797d4cfdc86866f2f45be80a
parentd97e924e5ac5852c15951409262e05a66ad82781
parent980bde389491e65df3a6f26f755064013b65740c
Merge branch 'mg/advice-statushints' into next

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

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