Fixed: escaped link in conflict resolution form (#11341).
Authored by: jplang 2012-07-07
Parent: [r9924]
Child: [r9926]