ux: show conflict sources when it comes from a stash or patch (#1067) #2412
| Job | Run time |
|---|---|
| 2s | |
| 3m 55s | |
| 4m 9s | |
| 2m 36s | |
| 1m 40s | |
| 2m 55s | |
| 2m 55s | |
| 54s | |
| 22s | |
| 16s | |
| 52s | |
| 22s | |
| 15s | |
| 21m 13s |
| Job | Run time |
|---|---|
| 2s | |
| 3m 55s | |
| 4m 9s | |
| 2m 36s | |
| 1m 40s | |
| 2m 55s | |
| 2m 55s | |
| 54s | |
| 22s | |
| 16s | |
| 52s | |
| 22s | |
| 15s | |
| 21m 13s |