← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-13 02:49:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5089.
  • Revision ID: jelmer@samba.org-20100313024914-rpuoguinoxpxt05b
Allow merge directives to output multiple patch files. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
5143
5143
               short_name='f',
5144
5144
               type=unicode),
5145
5145
        Option('output', short_name='o',
5146
 
               help='Write merge directive to this file; '
 
5146
               help='Write merge directive to this file or directory; '
5147
5147
                    'use - for stdout.',
5148
5148
               type=unicode),
5149
5149
        Option('strict',