https://bugs.kde.org/show_bug.cgi?id=488624
JATothrim <jarmo.tii...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Resolution|--- |FIXED
Status|ASSIGNED |RESOLVED
--- Comment #9 from JATothrim <jarmo.tii...@gmail.com> ---
> I published the extra code I had written top of
> 2cc13f8b03ef3d070a7be2b2ffd8d5b916a1fd6f
> However, I didn't make a merge request out of it, as I'm unsure if it would
> be useful
> https://invent.kde.org/jatothrim/kdiff3/-/commit/0ca09b38c2a38e290317655cf69ce414f88897ef
I apparently just hit a situation where this commit could be useful (but I need
to do a bit of development for this). On a three-way merge, with the current
fixes in master, I cannot select a change, as kdiff3 now insist there is only
white-space difference on line selection, which is not right. The three-way
merge is thus un-resolvable.
Well since at least the crashes are now fixed, so I think I can close this bug
ticket despite of this new issue...
--
You are receiving this mail because:
You are watching all bug changes.
