mergetools / gvimdiffon commit Merge branch 'mh/fast-import-notes-fix-new' into maint (867ce04)
   1. "$MERGE_TOOLS_DIR/vimdiff"