After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 753097 - 3-way merge broken
3-way merge broken
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: filediff
3.13.x
Other Linux
: Normal normal
: ---
Assigned To: meld-maint
meld-maint
Depends on:
Blocks:
 
 
Reported: 2015-07-31 09:33 UTC by gaxweb
Modified: 2016-01-15 19:52 UTC
See Also:
GNOME target: ---
GNOME version: 3.15/3.16


Description gaxweb 2015-07-31 09:33:09 UTC 
For a few versions now I've not been able to successfully use the "merge both sides" command (not sure about the label, I'm not using the English version).

The first version it happened in, it actually crashed the whole program. Then in later versions and the one I'm using right now it just stopped doing anything.

I'm on Fedora 22 and launching Meld through TortoiseHg.
Comment 1 Kai Willadsen 2015-07-31 21:27:45 UTC 
This is now fixed in the 3.14 branch and master, and will be in the next release. Thanks for the bug report.
Comment 2 gaxweb 2016-01-12 11:53:42 UTC 
Bug still exists in 3.14.0.
Comment 3 Kai Willadsen 2016-01-15 19:52:20 UTC 
This was fixed in the 3.14.1 release.