https://bugs.kde.org/show_bug.cgi?id=403799
michael <reeves...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Latest Commit| |https://commits.kde.org/kdi
| |ff3/b4980131b5d59e0be6739a2
| |fbed86dac096d67cc
Resolution|--- |FIXED
Status|REPORTED |RESOLVED
--- Comment #1 from michael <reeves...@gmail.com> ---
Git commit b4980131b5d59e0be6739a2fbed86dac096d67cc by Michael Reeves.
Committed on 01/02/2019 at 16:28.
Pushed by mreeves into branch 'master'.
Fix diff status handling.
*Never allow m_totalDiffStatus to be null
*set MergeFileInfo structure correctly
*drop uneeded const value parameter
M +1 -0 src/MergeFileInfos.h
M +10 -4 src/directorymergewindow.cpp
M +1 -1 src/directorymergewindow.h
M +2 -1 src/kdiff3.cpp
M +2 -2 src/kdiff3.h
M +4 -4 src/kdiff3_part.cpp
M +25 -35 src/pdiff.cpp
https://commits.kde.org/kdiff3/b4980131b5d59e0be6739a2fbed86dac096d67cc
--
You are receiving this mail because:
You are watching all bug changes.
