t / t4013 / diff.diff_--no-index_dir_dir3on commit git notes merge: Add automatic conflict resolvers (ours, theirs, union) (3228e67)
   1$ git diff --no-index dir dir3
   2$