mergetools / gvimdiffon commit sha1dc: update from upstream (6b851e5)
   1. "$MERGE_TOOLS_DIR/vimdiff"