mergetools / vimdiff2on commit add -p: fix checkout -p with pathological context (2bd69b9)
   1. "$MERGE_TOOLS_DIR/vimdiff"