tree ae9d0724810c76ea98ca064813e8339dcd0d2626
parent 3c5883b3c96e0435cca2e952754d76c4e45f72e4
author Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 1549421475 +0700
committer Junio C Hamano <gitster@pobox.com> 1549485968 -0800

checkout: count and print -m paths separately

Since 0f086e6dca (checkout: print something when checking out paths -
2018-11-13), this command reports how many paths have been updated
from what source (either from a tree, or from the index). I forget
that there's a third source: when -m is used, the merge conflict is
re-created (granted, also from the index, but it's not a straight copy
from the index).

Count and report unmerged paths separately. There's a bit more update
to avoid reporting:

   Recreated X merge conflicts
   Updated 0 paths from the index

The second line is unnecessary. Though if there's no conflict
recreation, we still report

   Updated 0 paths from the index

to make it clear we're not really doing anything.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>