/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/shelf_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
466
466
                if unshelver.message is not None:
467
467
                    trace.note(gettext('Message: %s') % unshelver.message)
468
468
                change_reporter = delta._ChangeReporter()
469
 
                merger = unshelver.make_merger(None)
 
469
                merger = unshelver.make_merger()
470
470
                merger.change_reporter = change_reporter
471
471
                if self.apply_changes:
472
472
                    merger.do_merge()