t / t4013 / diff.diff_--name-status_dir2_diron commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1$ git diff --name-status dir2 dir
   2$