Configure merge=union for changelog.txt to reduce merge conflicts
#5185
| Job | Run time |
|---|---|
| 23s | |
| 1m 3s | |
| 5m 4s | |
| 1m 46s | |
| 1m 24s | |
| 53s | |
| 42s | |
| 48s | |
| 52s | |
| 12m 55s |
merge=union for changelog.txt to reduce merge conflicts
#5185
| Job | Run time |
|---|---|
| 23s | |
| 1m 3s | |
| 5m 4s | |
| 1m 46s | |
| 1m 24s | |
| 53s | |
| 42s | |
| 48s | |
| 52s | |
| 12m 55s |