mergetools / vimdiff3on commit sha1dc: update from upstream (9936c1b)
   1. "$MERGE_TOOLS_DIR/vimdiff"