mergetools / vimdiff3on commit Merge branch 'js/t3404-grammo-fix' (6c35952)
   1. "$MERGE_TOOLS_DIR/vimdiff"