https://bugs.kde.org/show_bug.cgi?id=495937
michael <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Latest Commit| |https://invent.kde.org/sdk/ | |kdiff3/-/commit/9ce47549ec5 | |b0bfb6a2dba13fbadae5bb57302 | |66 Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #2 from michael <[email protected]> --- Git commit 9ce47549ec5b0bfb6a2dba13fbadae5bb5730266 by Michael Reeves, on behalf of Tomáš Hnyk. Committed on 07/09/2026 at 21:55. Pushed by mreeves into branch 'master'. Don't flag symlink-vs-file as a type conflict When "Follow file links" is on, a symlink paired with a regular file of the same name is now compared by following the link, instead of showing "Error: Conflicting File Types" in the Operation column of Directory merge. This is common for tools opening kdiff3 with "git difftool --dir-diff" like for example Lazygit does. Symlink against a directory still conflitcs. M +7 -2 src/MergeFileInfos.cpp https://invent.kde.org/sdk/kdiff3/-/commit/9ce47549ec5b0bfb6a2dba13fbadae5bb5730266 -- You are receiving this mail because: You are watching all bug changes.
