** Bug 47802 has been marked a duplicate of this bug -- Confusing merge conflict message when directory removed https://launchpad.net/bugs/47764
-- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
** Bug 47802 has been marked a duplicate of this bug -- Confusing merge conflict message when directory removed https://launchpad.net/bugs/47764
-- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs