mergetools / gvimdiffon commit Merge branch 'js/t3404-typofix' (a56a777)
   1. "$MERGE_TOOLS_DIR/vimdiff"