Provide clear feedback when a three-way merge is in effect
Authored by: vampm 2018-08-04
Parent: [r140]
Child: [r142]