~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/ru/user-guide/specifying_revisions.txt

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
128
128
~~~~~~~~
129
129
 
130
130
**ancestor**:*path*
131
 
    specifies the common ancestor between the current branch and a 
 
131
    specifies the common ancestor between the current branch and a
132
132
    different branch. This is the same ancestor that would be used for
133
133
    merging purposes.
134
134