t / t4013 / diff.diff_--no-index_dir_dir3on commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1$ git diff --no-index dir dir3
   2$