https://bugs.kde.org/show_bug.cgi?id=469853

michael <reeves...@gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
      Latest Commit|                            |c41ce64adb2680f3874abb03567
                   |                            |d9e61574c2920
   Version Fixed In|                            |1.10.4
         Resolution|---                         |FIXED
             Status|REPORTED                    |RESOLVED

--- Comment #1 from michael <reeves...@gmail.com> ---
You should now get a UI if auto-merge fails. This was a combination of a
regression from 34d36270c926a05e08391e623ecf3fae044c3a26 and a preexisting
condition that didn't flag failed-auto merges as unless there was a write
error.

See:

https://invent.kde.org/sdk/kdiff3/-/commit/9b494c55ee215ab212a7751c36991eb4b6892525
https://invent.kde.org/sdk/kdiff3/-/commit/c41ce64adb2680f3874abb03567d9e61574c2920

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to