mergetools / gvimdiff2on commit checkout -m: attempt merge when deletion of path was staged (6a143aa)
   1. "$MERGE_TOOLS_DIR/vimdiff"