Aaron, this was previously (anciently) marked fix-committed. Do you have a patch for this?
** Tags added: conflicts ignore merge
** Changed in: bzr
Status: Fix Committed => In Progress
--
Confusing merge conflict message when directory removed
https://bugs.launchpad.net/bugs/47764
You received this bug notification because you are a member of Ubuntu
Bugs, which is a subscriber of a duplicate bug.
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
