—
merge-conflict-alert-15731
Version-control notice whose body is a two-line diff, the incoming and outgoing versions stacked in red and green and each side lighting up as you point at it.
—
merge-conflict-alert-15731
Version-control notice whose body is a two-line diff, the incoming and outgoing versions stacked in red and green and each side lighting up as you point at it.