Commit a5221f3
fix(merge): regExp should not be treated as a objects when merging.
angular.merge({ key: /regexp/ }) now works the way you'd expect it to.
Horray!
Closes angular#12419
Closes angular#124091 parent 18a2e4f commit a5221f3Copy full SHA for a5221f3
File tree
Expand file treeCollapse file tree
2 files changed
+13
-0
lines changedOpen diff view settings
Filter options
- src
- test
Expand file treeCollapse file tree
2 files changed
+13
-0
lines changedOpen diff view settings
Collapse file
+2Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
354 | 354 | |
355 | 355 | |
356 | 356 | |
| 357 | + |
| 358 | + |
357 | 359 | |
358 | 360 | |
359 | 361 | |
|
Collapse file
+11Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
570 | 570 | |
571 | 571 | |
572 | 572 | |
| 573 | + |
| 574 | + |
| 575 | + |
| 576 | + |
| 577 | + |
| 578 | + |
| 579 | + |
| 580 | + |
| 581 | + |
| 582 | + |
| 583 | + |
573 | 584 | |
574 | 585 | |
575 | 586 | |
|
0 commit comments