mergetools / gvimdiff2on commit Merge branch 'sg/test-i18ngrep' into next (e83eb33)
   1. "$MERGE_TOOLS_DIR/vimdiff"