← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

[merge] win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
2
2
 
3
3
import changeset
4
4
from changeset import Inventory, apply_changeset, invert_dict
5
 
from bzrlib.osutils import backup_file, rename
 
5
from bzrlib.osutils import backup_file, rename, pathjoin
6
6
from bzrlib.merge3 import Merge3
7
7
import bzrlib
8
8
from bzrlib.atomicfile import AtomicFile
239
239
            parent_dir = {this_parent: this_dir, other_parent: other_dir, 
240
240
                          base_parent: base_dir}
241
241
            directory = parent_dir[parent]
242
 
            return os.path.join(directory, name)
 
242
            return pathjoin(directory, name)
243
243
        else:
244
244
            assert parent is None
245
245
            return None