Fix unnecessarily escaped merge error text
Previously merge errors that included quotes, slashes, or other escaped
characters were difficult to read. This commit uses the new v-safe-html
to display the merge error.
Relates to #246816 (closed)
Before
After
Edited by Stan Hu