feature: allow enabling 3-way merge when applying a patch (#2200) #4535
| Job | Run time |
|---|---|
| 3s | |
| 3m 20s | |
| 3m 57s | |
| 3m 50s | |
| 3m 58s | |
| 3m 47s | |
| 3m 12s | |
| 29s | |
| 31s | |
| 51s | |
| 58s | |
| 22s | |
| 17s | |
| 25m 35s |
| Job | Run time |
|---|---|
| 3s | |
| 3m 20s | |
| 3m 57s | |
| 3m 50s | |
| 3m 58s | |
| 3m 47s | |
| 3m 12s | |
| 29s | |
| 31s | |
| 51s | |
| 58s | |
| 22s | |
| 17s | |
| 25m 35s |