]> git.lizzy.rs Git - rust.git/commitdiff
Merge #6669
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Sun, 29 Nov 2020 15:46:08 +0000 (15:46 +0000)
committerGitHub <noreply@github.com>
Sun, 29 Nov 2020 15:46:08 +0000 (15:46 +0000)
6669: Align default importMergeBehaviour with VSCode r=lnicola a=flodiebold

Co-authored-by: Florian Diebold <flodiebold@gmail.com>

Trivial merge