From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 Feb 2019 04:44:51 +0000 (-0800)
Subject: Merge branch 'nd/checkout-noisy-unmerge'
X-Git-Tag: v2.21.0-rc1~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4

Merge branch 'nd/checkout-noisy-unmerge'

"git checkout [<tree-ish>] <pathspec>" started reporting the number
of paths that have got updated recently, but the same messages were
given when "git checkout -m <pathspec>" to unresolve conflicts that
have just been resolved.  The message now reports these unresolved
paths separately from the paths that are checked out from the index.

* nd/checkout-noisy-unmerge:
checkout: count and print -m paths separately
checkout: update count-checkouts messages
---

87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4