mergetools / gvimdiffon commit Merge branch 'es/grep-require-name-when-needed' (ac97dc4)
   1. "$MERGE_TOOLS_DIR/vimdiff"