mergetools / gvimdiffon commit Merge branch 'js/spell-out-options-in-tests' (39e4773)
   1. "$MERGE_TOOLS_DIR/vimdiff"