mergetools / gvimdiffon commit Merge branch 'jk/mailmap-incomplete-line' (af226bf)
   1. "$MERGE_TOOLS_DIR/vimdiff"