32
32
.. Fixes for situations where bzr would previously crash or give incorrect
44
35
* During merges, when two entries end up using the same path for two
45
36
different file-ids (the same file being 'bzr added' in two different
46
37
branches) , 'duplicate' conflicts are created instead of 'content'