t / t4013 / diff.diff_--no-index_dir_dir3on commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1$ git diff --no-index dir dir3
   2$