Andrew's git / gitweb.git / diff
?
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)
Give finer classification to various states of paths in conflicted
state and offer advice messages in the "git status" output.

Trivial merge