mergetools / gvimdiffon commit add -p: fix 2.17.0-rc* regression due to moved code (fd2fb4a)
   1. "$MERGE_TOOLS_DIR/vimdiff"