t / t4013 / diff.diff_--name-status_dir2_diron commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1$ git diff --name-status dir2 dir
   2$