t / t4013 / diff.diff_--no-index_dir_dir3on commit am -3: do not let failed merge from completing the error codepath (c63d4b2)
   1$ git diff --no-index dir dir3
   2$