← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
260
260
        :param sign: If True, gpg-sign the email
261
261
        :return: an email message
262
262
        """
263
 
        mail_from = branch.get_config().username()
 
263
        mail_from = branch.get_config_stack().get('email')
264
264
        if self.message is not None:
265
265
            subject = self.message
266
266
        else: