The merge message, when two users edit the same topic, should be cleaned up.

1. PARAM 2 is wrong as sub stringify within User.pm returns: $this->{login}/$this->{web}.$this->{wikiname}

which results in: Main.UserName/Main.UserName

2. There is no regular way to continue except showing the differences of the merge. At least there should be a way to simply go to the topic view.

-- AU

Nr. 2 seems to be a general issue. Most messages miss the [OK] button to go back to the topic. (Although there are messages where there should not be an [OK] button to let users go back to the previous screen.)

-- PTh

In interest of getting eventual conflicts resolved asap, I think a link to diffs is the best link to offer under all circumstances.

Regarding missing OK buttons, TestCaseOopsAttention / Alerts has a list of user messages, feel free to create proper patches

-- SP

OK button added to merge_notice.

SVN 8649.

-- SP

ok, number 1 just looks odd because you are using WikiName as usename, and because I suspect that stringify was not really intended to be called when the user sees it. I'm not going to change the code now :()

-- SD

To solve (2) there should be called another Method, so that the user sees the right name.

-- AU

SVN 8995.

-- SP

merged in 9214

-- RA

Closed with release of 4.0.2

KJL