t / t4013 / diff.diff_--name-status_dir2_diron commit git notes merge: Add automatic conflict resolvers (ours, theirs, union) (3228e67)
   1$ git diff --name-status dir2 dir
   2$