mergetools / gvimdiffon commit Merge branch 'js/misc-fixes' (808d119)
   1. "$MERGE_TOOLS_DIR/vimdiff"