mergetools / gvimdiffon commit Merge branch 'jk/shortlog-ident-cleanup' (17cb5f8)
   1. "$MERGE_TOOLS_DIR/vimdiff"