t / t4013 / diff.diff_--no-index_--raw_--abbrev=4_dir2_diron commit unpack-trees: fix oneway_merge accidentally carry over stage index (ab5af82)
   1$ git diff --no-index --raw --abbrev=4 dir2 dir
   2:000000 100644 0000... 0000... A        dir/sub
   3$