https://bugs.kde.org/show_bug.cgi?id=442582

            Bug ID: 442582
           Summary: When merging files from`git mergetool`, output is
                    scrolled to top instead of first conflict
           Product: kdiff3
           Version: 1.9.3
          Platform: Other
                OS: Linux
            Status: REPORTED
          Severity: normal
          Priority: NOR
         Component: application
          Assignee: [email protected]
          Reporter: [email protected]
  Target Milestone: ---

SUMMARY
When I run `git mergetool` and it opens KDiff3, the Output pane is scrolled to
the top rather than the first conflict, until I click "previous delta" and
"next delta".

STEPS TO REPRODUCE
1. Run `git config --global merge.tool kdiff3`.
2. In a git repository with a merge conflict, run `git mergetool`.

OBSERVED RESULT
The "Output:" pane is scrolled to the top of the document.

EXPECTED RESULT
The "Output:" pane is scrolled to the location of the first conflict, like the
A/B/C panes.

SOFTWARE/OS VERSIONS
Operating System: Arch Linux
KDE Plasma Version: 5.22.5
KDE Frameworks Version: 5.86.0
Qt Version: 5.15.2
Kernel Version: 5.14.3-zen1-1-zen (64-bit)
Graphics Platform: X11
Processors: 12 × AMD Ryzen 5 5600X 6-Core Processor
Memory: 15.6 GiB of RAM
Graphics Processor: NVIDIA GeForce GT 730/PCIe/SSE2

This occurred on KDiff3 1.9.3 but not 1.8.5, and I believe it didn't occur on
1.9.2.

ADDITIONAL INFORMATION

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to