This warning about conflicts is true, but hilarious. Merging the prerequisite branch into lp:bzr produces conflicts, and merging lp:~abentley/bzr/is_executable produces identical conflicts. So they don't show up in the diff, but they do show up in the warning.
This warning about conflicts is true, but hilarious. Merging the prerequisite branch into lp:bzr produces conflicts, and merging lp:~abentley/bzr/is_executable produces identical conflicts. So they don't show up in the diff, but they do show up in the warning.