Make jj prev and jj next work when the working copy is a merge commit
#10390
| Job | Run time |
|---|---|
| 4m 8s | |
| 24s | |
| 2m 58s | |
| 24s | |
| 29s | |
| 10m 0s | |
| 5m 1s | |
| 28s | |
| 2m 25s | |
| 35s | |
| 13s | |
| 27m 5s |