https://bugs.kde.org/show_bug.cgi?id=426301
Bug ID: 426301
Summary: kdiff3: Data loss error when used with "git mergetool"
Product: kdiff3
Version: 1.8.4
Platform: Archlinux Packages
OS: Linux
Status: REPORTED
Severity: normal
Priority: NOR
Component: application
Assignee: reeves...@gmail.com
Reporter: chrno-sphe...@hotmail.com
Target Milestone: ---
SUMMARY
using kdiff3 as git mergetool leads to an error message being displayed,
loading the same files manually works.
STEPS TO REPRODUCE
1. create a (text) file conflict situation in git
2. attempt to run "git mergetool" with kdiff3 configured
OBSERVED RESULT
"Severe Internal Error"/"Data loss error:
If it is reproducible please contact the author."
EXPECTED RESULT
kdiff3 opening and merging the files
SOFTWARE/OS VERSIONS
Linux/KDE Plasma: arch linux current / plasma 5.19-5
KDE Plasma Version: 5.19
KDE Frameworks Version: 5.73.0
Qt Version: 5.15
git Version: 2.28.0
ADDITIONAL INFORMATION
It used to work a few versions before (very helpful, I know...), but I can't
say when exactly it stopped working. I first noticed it with 1.8.3 and it is
still occurring with 1.8.4
--
You are receiving this mail because:
You are watching all bug changes.
