/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-12 17:53:47 UTC
  • mfrom: (6813 trunk)
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112175347-wovgaqmkbyo8fo7f
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
4904
4904
        Option('reverse', 'Reverse the order of revisions.'),
4905
4905
        Option('mine-only',
4906
4906
               'Display changes in the local branch only.'),
4907
 
        Option('this' , 'Same as --mine-only.'),
 
4907
        Option('this', 'Same as --mine-only.'),
4908
4908
        Option('theirs-only',
4909
4909
               'Display changes in the remote branch only.'),
4910
4910
        Option('other', 'Same as --theirs-only.'),