← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

[merge] jam-integration 1503

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
792
792
        if revision is not None:
793
793
            if b2 is not None:
794
794
                raise BzrCommandError("Can't specify -r with two branches")
795
 
            if len(revision) == 1:
 
795
            if (len(revision) == 1) or (revision[1].spec is None):
796
796
                return show_diff(tree.branch, revision[0], specific_files=file_list,
797
797
                                 external_diff_options=diff_options)
798
798
            elif len(revision) == 2: