t / t4013 / diff.diff_--no-index_dir_dir3on commit mergetool--lib: add p4merge as a pre-configured mergetool option (c8998b4)
   1$ git diff --no-index dir dir3
   2$