https://bugs.kde.org/show_bug.cgi?id=482590
Bug ID: 482590
Summary: kdiff3 segfaults when used with git mergetool
Classification: Applications
Product: kdiff3
Version: unspecified
Platform: Other
OS: Linux
Status: REPORTED
Severity: normal
Priority: NOR
Component: application
Assignee: reeves...@gmail.com
Reporter: herzensch...@gmail.com
Target Milestone: ---
Attempting to run git mergetool while having kdiff3 installed to resolve
conflicts for a rebase causes kdiff3 to segfault with output like this:
```
This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge
ecmerge p4merge araxis bc codecompare smerge emerge vimdiff nvimdiff
Merging:
README.md
Normal merge conflict for 'README.md':
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (kdiff3):
/usr/libexec/git/mergetools/kdiff3: line 11: 22393 Segmentation fault
(core dumped) "$merge_tool_path" --auto --L1 "$MERGED (Base)" --L2 "$MERGED
(Local)" --L3 "$MERGED (Remote)" -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" >
/dev/null 2>&1
merge of README.md failed
```
Running kdiff3 separately runs just fine.
--
You are receiving this mail because:
You are watching all bug changes.
