Checkout
stsp
committed
on 12 Apr
* staging/docs/release-notes/1.12.html
(conflict-resolver): Document resolver features added for 1.12.