t / t4013 / diff.diff_--name-status_dir2_diron commit resolve-undo: teach "update-index --unresolve" to use resolve-undo info (8aa3856)
   1$ git diff --name-status dir2 dir
   2$