Improving diff3 conflict quality -- reducing the prevalence of nested conflicts with recursive merges #22409
| Job | Run time |
|---|---|
| 5s | |
| 42s | |
| 0s | |
| 9m 28s | |
| 10m 19s | |
| 9m 23s | |
| 7m 38s | |
| 1m 42s | |
| 5m 26s | |
| 30m 53s | |
| 10m 20s | |
| 9m 54s | |
| 26m 46s | |
| 10m 57s | |
| 11m 48s | |
| 28m 17s | |
| 10m 18s | |
| 10m 50s | |
| 34m 15s | |
| 27m 16s | |
| 31m 57s | |
| 25m 13s | |
| 3m 30s | |
| 3m 54s | |
| 4m 42s | |
| 0s | |
| 6m 0s | |
| 10m 1s | |
| 4m 23s | |
| 6m 37s | |
| 6m 31s | |
| 7m 14s | |
| 6m 34s | |
| 5m 7s | |
| 8m 34s | |
| 6m 4s | |
| 6h 32m 38s |