35
35
* Cope with Unix filesystems, such as smbfs, where chmod gives 'permission
36
36
denied'. (Martin Pool, #606537)
38
44
* During merges, when two entries end up using the same path for two
39
45
different file-ids (the same file being 'bzr added' in two different
40
46
branches) , 'duplicate' conflicts are created instead of 'content'