diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-02-12 12:32:26 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2017-02-12 12:32:26 -0700 |
| commit | b20508c4d49bd7269bcd42d39372a6b81af415cf (patch) | |
| tree | e6d2d70eb4f029b6ffb23292502eff9dfb0b52a1 /numpy/lib/tests/test_stride_tricks.py | |
| parent | d9d266ada4d90fb87b61773bb760e8e7e5bb6ba9 (diff) | |
| download | numpy-b20508c4d49bd7269bcd42d39372a6b81af415cf.tar.gz | |
MAINT: Decrease merge conflicts in release notes
Merge conflicts due to the release notes has been an annoying
problem requiring a rebase of otherwise good PRs. The solution
here is to use the --union option when merging to those files.
Closes #8603.
Diffstat (limited to 'numpy/lib/tests/test_stride_tricks.py')
0 files changed, 0 insertions, 0 deletions