Bug 321441 - 3-way-merge support
Summary: 3-way-merge support
Status: CONFIRMED
Alias: None
Product: kompare
Classification: Applications
Component: general (show other bugs)
Version: unspecified
Platform: Other Unspecified
: NOR wishlist
Target Milestone: ---
Assignee: Kompare developers
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-20 19:21 UTC by Mister Ypsilon
Modified: 2018-03-28 10:54 UTC (History)
1 user (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description Mister Ypsilon 2013-06-20 19:21:32 UTC 
3-way-merge support for kompare would be nice! Then you could use it as a git mergetool.

Reproducible: Always
Comment 1 Kevin Kofler 2013-06-20 21:14:02 UTC 
The 3_way_kompare development branch was supposed to add this feature, but AFAIK this was never implemented even on that branch.

You can try KDiff3 for now.
Comment 2 Jan Kriho 2018-03-28 10:54:42 UTC 
*** This bug has been confirmed by popular vote. ***