/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 bzrlib/log.py

  • Committer: Martin von Gagern
  • Date: 2011-09-19 08:42:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6148.
  • Revision ID: martin.vgagern@gmx.net-20110919084237-ck2r99f2ic7m2wxj
Rename --include-sidelines to --include-merged.

This better matches phrases used in existing code and docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
1412
1412
            if advice_sep:
1413
1413
                self.to_file.write(advice_sep)
1414
1414
            self.to_file.write(
1415
 
                "Use --include-sidelines or -n0 to see merged revisions.\n")
 
1415
                "Use --include-merged or -n0 to see merged revisions.\n")
1416
1416
 
1417
1417
    def get_advice_separator(self):
1418
1418
        """Get the text separating the log from the closing advice."""