t / t4013 / diff.diff_--no-index_dir_dir3on commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1$ git diff --no-index dir dir3
   2$