diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-06-28 15:20:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-28 15:20:35 -0700 |
commit | 30e8e6fdeadbd7c3f7dd8defed654e1e98290a45 (patch) | |
tree | 0cfc87e044491a1879cef0eb6258c4eb0562e13c /t/lib-git-daemon.sh | |
parent | fbc9724188fb4040e1f248de1e61752b385c1841 (diff) | |
parent | 2d1ccebae41541946ddd7e32f291f3c8983feea9 (diff) | |
download | git-30e8e6fdeadbd7c3f7dd8defed654e1e98290a45.tar.gz git-30e8e6fdeadbd7c3f7dd8defed654e1e98290a45.tar.xz |
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.
Diffstat (limited to 't/lib-git-daemon.sh')
0 files changed, 0 insertions, 0 deletions