[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 michael changed: What|Removed |Added Status|CONFIRMED |RESOLVED Resolution|---

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 michael changed: What|Removed |Added Latest Commit||e2f46c065c4de3ae05363bad8f3 |

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 --- Comment #7 from michael --- The current stable branch is 1.10.x this appears fixed there and in master however I have no recollection of the exact commit. Awaiting confirmation. -- You are receiving this mail because: You are watching all bug cha

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 --- Comment #6 from sv...@google.com --- @michael See the duped bug, you need to enable option "Align B and C for 3 input files" -- that's when the crashes happen. I'm currently on 1.9.6 and it's still crashing with the example files -- You are receiv

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 --- Comment #5 from michael --- Weirdly both these cases work on my machine with the latest commits on master and 1.9. The 1.9 has two unrelated bug fixes which wouldn't have impacted the diff process. That's on comparing the files via the GUI and conte

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 michael changed: What|Removed |Added Status|REPORTED|CONFIRMED Ever confirmed|0

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 --- Comment #4 from michael --- Looks like some else got a minimal repo on this linked as dup so it doesn't get lost again. -- You are receiving this mail because: You are watching all bug changes.

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 michael changed: What|Removed |Added CC||sv...@google.com --- Comment #3 from michael --- ***

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 Tiago Moraes changed: What|Removed |Added CC||tiagoefmor...@gmail.com --- Comment #2 from Tiag

[kdiff3] [Bug 442618] KDiff3 crashes on a git merge conflict with "Severe Internal Error line != i for srcSelector= 1"

https://bugs.kde.org/show_bug.cgi?id=442618 --- Comment #1 from vlov...@gmail.com --- The problematic setting appears to be Diff3AlignBC=true. If I set that to false the crash resolves. -- You are receiving this mail because: You are watching all bug changes.