Find a file
bors[bot] 34ae08d2a2 Merge rust-lang/libm#92
92: Use separate imports instead of {}-grouped imports for better merges r=japaric a=porglezomp

Previously every merge would cause conflicts because the {}-group would re-flow, which the merge algorithm can't handle. This will hopefully make rebases and merges go more smoothly while everyone is still adding new modules.

Co-authored-by: C Jones <code@calebjones.net>
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
2018-07-14 16:00:03 +00:00
library/compiler-builtins/libm Merge branch 'master' into separate-import 2018-07-14 10:59:40 -05:00