| Log Message: |
If the user selects a repository-side move target for a conflict,
make conflict descriptions show this move target instead of always
showing the first possible move.
* subversion/libsvn_client/conflicts.c
(describe_incoming_deletion_upon_update,
(describe_incoming_deletion_upon_switch,
(describe_incoming_deletion_upon_merge): Use the current user-specified
repository-side move target in conflict descriptions, if available.
|
subversion/trunk/subversion/libsvn_client/conflicts.c