t / t4013 / diff.diff_--no-index_dir_dir3on commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1$ git diff --no-index dir dir3
   2$