Bug 572309 - Merge tool editor is blank
Summary: Merge tool editor is blank
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 5.12   Edit
Hardware: PC Windows 10
: P3 critical (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: needinfo
Depends on:
Blocks:
 
Reported: 2021-03-25 12:31 EDT by Particular Miner CLA
Modified: 2021-03-26 10:06 EDT (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Particular Miner CLA 2021-03-25 12:31:32 EDT
Whenever I access the Merge Tool menu item in order to resolve merge conflicts, it opens a completely blank editor view.  This is the exact same problem described in the following link:

https://www.eclipse.org/forums/index.php/fa/36070/0/
Comment 1 Particular Miner CLA 2021-03-25 12:37:56 EDT
This is the exact same problem described in the following link: https://www.eclipse.org/forums/index.php/t/1100062/
Comment 2 Thomas Wolf CLA 2021-03-25 17:40:24 EDT
We'll need much more information to be able to analyze this. Are there any errors in the log? If so, what?
Comment 3 Thomas Wolf CLA 2021-03-26 10:06:41 EDT
Also: how is the merge tool configured? What's the setting in the Git preferences of item "Merge tool content"?