Comment 3 for bug 195133

Hi,

What do you know, the change was that easy that I could do it
tonight. (Assuming I got it right of course).

Attached is the merge directive containing my change.

I'm not that happy about the change to the other test, but as
the thread was created to be empty it means that the
message is correct.

The other issue that I have is the check for the return of
the merge_inner function, is that the correct thing to do?
If it is omitted the conflicts test fails, as the only change
in the thread is the addition of a file, and has_changed then
misses this. I think it is the right thing, but I would like
confirmation.

Thanks,

James