git: add dummy conflict to index if necessary #633
| Job | Run time |
|---|---|
| 5m 6s | |
| 5m 6s | |
| 5m 11s | |
| 5m 11s | |
| 5m 31s | |
| 5m 31s | |
| 6m 42s | |
| 6m 42s | |
| 15m 16s | |
| 10m 19s | |
| 4m 25s | |
| 4m 25s | |
| 9m 16s | |
| 9m 16s | |
| 1h 37m 57s |
| Job | Run time |
|---|---|
| 5m 6s | |
| 5m 6s | |
| 5m 11s | |
| 5m 11s | |
| 5m 31s | |
| 5m 31s | |
| 6m 42s | |
| 6m 42s | |
| 15m 16s | |
| 10m 19s | |
| 4m 25s | |
| 4m 25s | |
| 9m 16s | |
| 9m 16s | |
| 1h 37m 57s |