t / t4013 / diff.diff_--no-index_dir_dir3on commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1$ git diff --no-index dir dir3
   2$