t / t4013 / diff.noellipses-diff_--no-index_--raw_dir2_diron commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1$ git diff --no-index --raw dir2 dir
   2:000000 100644 0000000 0000000 A        dir/sub
   3$