mergetools / gvimdiff2on commit Merge branch 'jk/commit-dates-parsing-fix' into maint (8aac6c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"