mergetools / gvimdiff2on commit Merge branch 'sb/mailmap-updates' (6f7d6ec)
   1. "$MERGE_TOOLS_DIR/vimdiff"