← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
37
37
    files.)
38
38
    """
39
39
    def run(self):
40
 
        for path in Branch.open_containing('.')[0].working_tree().iter_conflicts():
 
40
        for path in Branch.open_containing(u'.')[0].working_tree().iter_conflicts():
41
41
            print path
42
42
 
43
43
class cmd_resolve(bzrlib.commands.Command):
51
51
            if not all:
52
52
                raise BzrCommandError(
53
53
                    "command 'resolve' needs one or more FILE, or --all")
54
 
            tree = Branch.open_containing('.')[0].working_tree()
 
54
            tree = Branch.open_containing(u'.')[0].working_tree()
55
55
            file_list = list(tree.abspath(f) for f in tree.iter_conflicts())
56
56
        else:
57
57
            if all: