[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 michael changed: What|Removed |Added Latest Commit|https://invent.kde.org/sdk/ |https://invent.kde.org/sdk/ |kdiff3/-/commit/d6d661f74a9 |kdiff3/-/commit/32d4d0321a9 |6c734daa74d3f4a36534ca35ce8 |5be4318312d5ebb567137fff5f4 |3a |8d --- Comment #10 from michael --- Git commit 32d4d0321a95be4318312d5ebb567137fff5f48d by Michael Reeves. Committed on 13/06/2023 at 19:11. Pushed by mreeves into branch 'master'. Turn on updates before calling MergeResultWindow::slotGoNextUnsolvedConflict FIXED-IN:1.10.5 M +3-2src/pdiff.cpp https://invent.kde.org/sdk/kdiff3/-/commit/32d4d0321a95be4318312d5ebb567137fff5f48d -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 michael changed: What|Removed |Added Latest Commit||https://invent.kde.org/sdk/ ||kdiff3/-/commit/d6d661f74a9 ||6c734daa74d3f4a36534ca35ce8 ||3a Resolution|--- |FIXED Version Fixed In||1.10.5 Status|ASSIGNED|RESOLVED --- Comment #9 from michael --- Git commit d6d661f74a96c734daa74d3f4a36534ca35ce83a by Michael Reeves. Committed on 13/06/2023 at 19:08. Pushed by mreeves into branch '1.10'. Turn on updates before calling MergeResultWindow::slotGoNextUnsolvedConflict FIXED-IN:1.10.5 M +3-2src/pdiff.cpp https://invent.kde.org/sdk/kdiff3/-/commit/d6d661f74a96c734daa74d3f4a36534ca35ce83a -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 Vladimír Čunát changed: What|Removed |Added CC||vcu...@gmail.com -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 michael changed: What|Removed |Added Status|REOPENED|ASSIGNED --- Comment #8 from michael --- Thanks I'll have a look at this. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 --- Comment #7 from nyanpasu64 --- Created attachment 159419 --> https://bugs.kde.org/attachment.cgi?id=159419=edit Picture of "git mergetool" opening kdiff3 1.10.4, with output scrolled to top -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 nyanpasu64 changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- Ever confirmed|0 |1 --- Comment #6 from nyanpasu64 --- Actually the bug still occurs on 1.10.4 I think? -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 michael changed: What|Removed |Added Status|NEEDSINFO |RESOLVED Resolution|WAITINGFORINFO |FIXED --- Comment #5 from michael --- Go ahead file a separate report for the new scroll. Likely a different root. Also FYI bugs left in NEEDSINFO status don't show in the default search and subject to possible automated closer after an extended period of inactivity. REPORTED is safe state to switch to when responding to such bugs. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 --- Comment #4 from nyanpasu64 --- Tried kdiff3 1.10.4 with two (not three) files. Now the up and down arrows do not scroll the document *at all*! Unless I turn off "Word Wrap Diff Windows", then it works. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 michael changed: What|Removed |Added Resolution|--- |WAITINGFORINFO Status|REPORTED|NEEDSINFO --- Comment #3 from michael --- This appears to be fixed in 1.10.3/1.10.2. Is anyone able to repo. in the latest release? -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 dgro...@gmail.com changed: What|Removed |Added Version|1.9.3 |1.9.6 CC||dgro...@gmail.com --- Comment #2 from dgro...@gmail.com --- Same issue here on 1.9.6 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 442582] When merging files from`git mergetool`, output is scrolled to top instead of first conflict
https://bugs.kde.org/show_bug.cgi?id=442582 Pedro Ferreira changed: What|Removed |Added CC||arkang...@gmail.com --- Comment #1 from Pedro Ferreira --- I'm on 1.9.2 and this happens to me. -- You are receiving this mail because: You are watching all bug changes.
