Viewing all changes in revision 1185.33.26.

Committer: Martin Pool
Date: 2005-11-17 03:49:30 UTC
mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.18 bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1509.
Revision ID: mbp@sourcefrog.net-20051117034930-68148f4f6ee985e8

Give a warning, not exception, when trying to merge
x-bit against deletion.

Workaround for #4558

added added

removed removed