t / t4013 / diff.diff_--name-status_dir2_diron commit git-cvsimport: fix merging with remote parent branch (c36c5b8)
   1$ git diff --name-status dir2 dir
   2A       dir/sub
   3$