t / t4013 / diff.diff_--no-index_--name-status_dir2_diron commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1$ git diff --no-index --name-status dir2 dir
   2A       dir/sub
   3$