Public bug reported:
Since updating to Ubuntu Wily when resolving a git merge conflict with
meld I get this message in the console when using "Merge All" from the
menu.
TypeError: merge_all_non_conflicting_changes() takes exactly 1 argument
(2 given)
The "Merge All" doesn't do anything. I'd expect to merge all the (non-
conflicting) merge hunks that are marked in blue.
** Affects: meld (Ubuntu)
Importance: Undecided
Status: New
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1511945
Title:
Failed "Merge All", TypeError: merge_all_non_conflicting_changes()
takes exactly 1 argument (2 given)
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/meld/+bug/1511945/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
