Fix conflict resolver bug where local and incoming edits got swapped.
When auto-resolving an incoming file move vs local file edit tree conflict after an update or switch operation, text conflicts were created with the incoming changes (theirs) and local changes (mine) swapped within text conflict markers. When such a text conflict was then resolved with the --accept mf/mc/tf/tc options the result was the opposite of what it should have been.
Reported by: Jonathan Guy
* subversion/libsvn_client/conflicts.c (resolve_incoming_move_file_text_merge): After update/switch, run the text merge in a way that makes local and incoming changes properly land on their respective sides of a text conflict.