Merge branch 'jk/trailers-use-config' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"