mergetools / gvimdiffon commit Merge branch 'jk/trailer-fixes' into maint (e293824)
   1. "$MERGE_TOOLS_DIR/vimdiff"