Merge branch 'nd/checkout-noisy-unmerge'
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:51 +0000 (20:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:51 +0000 (20:44 -0800)
"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

1  2 
builtin/checkout.c
Simple merge