48
48
* Better message if there is an error while setting ownership of
49
49
``.bazaar`` directory. (Parth Malwankar, #657553)
51
55
* ``bzr resolve --take-other <file>`` will not crash anymore if ``<file>``
52
56
is involved in a text conflict (but the conflict is still not
53
57
resolved). (Vincent Ladeuil, #646961)