mergetools / gvimdiff2on commit Merge branch 'rs/mailmap-himself' (cbc7fdf)
   1. "$MERGE_TOOLS_DIR/vimdiff"