37
37
.. Fixes for situations where bzr would previously crash or give incorrect
40
43
* ``bzr resolve --take-other <file>`` will not crash anymore if ``<file>``
41
44
is involved in a text conflict (but the conflict is still not
42
45
resolved). (Vincent Ladeuil, #646961)