mergetools / gvimdiffon commit fr: a lot of good fixups (a6e8883)
   1. "$MERGE_TOOLS_DIR/vimdiff"