~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/release-notes/bzr-2.5.txt

  • 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:
131
131
  those commits that merged branches, i.e. those having more than one
132
132
  parent.
133
133
  In order to avoid confusion, the previous command line option
134
 
  ``--include-merges`` has been renamed to ``--include-sidelines``.
 
134
  ``--include-merges`` has been renamed to ``--include-merged``.
135
135
  The old name of the command line option will still be accepted.
136
136
  The name change also affects ``bzr missing``.
137
137
  (Martin von Gagern)