0.12dev: Final fixes for #7715.
* Reverted part of [8279] and added a note when a merge property change has no actual effect. * Changed wording to be consistent with Subversion ("reverse-merged" instead of "un-merged"). * Fixed display of removed merge sources.
Authored by: rblank 2009-06-21
Parent: [r8279]
Child: [r8281]
