Merge branch 'en/string-list-can-be-custom-sorted' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"