Merge branch 'lk/more-helpful-status-hints'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:20:35 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2012 22:20:35 +0000 (15:20 -0700)
commit30e8e6fdeadbd7c3f7dd8defed654e1e98290a45
tree0cfc87e044491a1879cef0eb6258c4eb0562e13c
parentfbc9724188fb4040e1f248de1e61752b385c1841
parent2d1ccebae41541946ddd7e32f291f3c8983feea9
Merge branch 'lk/more-helpful-status-hints'

Give finer classification to various states of paths in conflicted
state and offer advice messages in the "git status" output.