t / t4013 / diff.diff_--name-status_dir2_diron commit Merge branch 'jk/rebase-i-submodule-conflict-only' into maint (a4da338)
   1$ git diff --name-status dir2 dir
   2$