FS#59885 - [kdiff3] Segfault with git mergetool
Attached to Project:
Arch Linux
Opened by Rafael Reggiani Manzo (manzo) - Thursday, 30 August 2018, 20:27 GMT
Last edited by Doug Newgard (Scimmia) - Monday, 03 September 2018, 14:13 GMT
Opened by Rafael Reggiani Manzo (manzo) - Thursday, 30 August 2018, 20:27 GMT
Last edited by Doug Newgard (Scimmia) - Monday, 03 September 2018, 14:13 GMT
|
Details
Description:
When dealing with a git merge conflict and using `git mergetool` I get the following output: /usr/lib/git-core/mergetools/kdiff3: line 7: 6528 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 Downgrading to 0.9.98-6 solves. Additional info: * package version: 0.9.98.git20180821-1 |
This task depends upon
Closed by Doug Newgard (Scimmia)
Monday, 03 September 2018, 14:13 GMT
Reason for closing: Fixed
Additional comments about closing: kdiff3 0.9.98.git20180830-1
Monday, 03 September 2018, 14:13 GMT
Reason for closing: Fixed
Additional comments about closing: kdiff3 0.9.98.git20180830-1
Comment by Antonio Rojas (arojas) -
Thursday, 30 August 2018, 22:42 GMT
Please test 0.9.98.git20180830 and report upstream if still valid.