t / t4013 / diff.diff_--name-status_dir2_diron commit diff --stat: do not count "unmerged" entries (82dfc2c)
   1$ git diff --name-status dir2 dir
   2$