https://bugs.kde.org/show_bug.cgi?id=426301
mafjm...@gmail.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|RESOLVED |REOPENED
CC| |mafjm...@gmail.com
Resolution|WORKSFORME |---
Ever confirmed|0 |1
--- Comment #5 from mafjm...@gmail.com ---
SUMMARY
Git mergetool: kdiff3 fails with Data loss error on conflicts on revert hunks
STEPS TO REPRODUCE
In the following scenario git mergetool with kdiff3 always ends up with 'Data
loss error'.
This has been for years - so not a recent regression.
git mergetool -t meld works but of course is not as useful, also vscode can
show the conflicting hunk.
o change A
|
|\
o | revert change A
| o hunk building on change A
|/
. merge attempt shows conflict between two branches
OBSERVED RESULT
git mergetool with kdiff3 as the tool fails. It is always 'Data loss error'.
Cannot share repo as non-public.
EXPECTED RESULT
Kdiff3 starts
SOFTWARE/OS VERSIONS
Name : kdiff3
Version : 1.8.4
Release : 1.fc31
Architecture : x86_64
Size : 5.9 M
Source : kdiff3-1.8.4-1.fc31.src.rpm
ADDITIONAL INFORMATION
--
You are receiving this mail because:
You are watching all bug changes.
