mergetools / gvimdiffon commit Merge branch 'jk/t4205-cleanup' into maint (66d6511)
   1. "$MERGE_TOOLS_DIR/vimdiff"