From: Junio C Hamano Date: Thu, 28 Jun 2012 22:20:35 +0000 (-0700) Subject: Merge branch 'lk/more-helpful-status-hints' X-Git-Tag: v1.7.12-rc0~69 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30e8e6fdeadbd7c3f7dd8defed654e1e98290a45;p=thirdparty%2Fgit.git 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. --- 30e8e6fdeadbd7c3f7dd8defed654e1e98290a45