*** This bug is a duplicate of bug 47764 *** ** This bug has been marked a duplicate of bug 47764 Confusing merge conflict message when directory removed
-- Misleading "Conflict adding files", merging from branch where directory was deleted https://launchpad.net/bugs/47802 -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
