https://bugs.freedesktop.org/show_bug.cgi?id=77065
--- Comment #4 from Patrick Ohly <patrick.ohly(a)gmx.de> ---
Created attachment 97139
-->
https://bugs.freedesktop.org/attachment.cgi?id=97139&action=edit
server item wins, URI sent back
I thought I knew what triggered the issue, but it looks like I was wrong.
Here's the log file from the local side where merging has to be done for an
update/update confict (look for "John 2 Doe") and it works correctly without
the script patch.
--
You are receiving this mail because:
You are on the CC list for the bug.