ux: always show Merge (Built-in) context menu entry for conflicts
#1040
| Job | Run time |
|---|---|
| 51s | |
| 51s |
Merge (Built-in) context menu entry for conflicts
#1040
| Job | Run time |
|---|---|
| 51s | |
| 51s |