mergetools / gvimdiffon commit Merge branch 'es/check-mailmap' (e683889)
   1. "$MERGE_TOOLS_DIR/vimdiff"