← Back to branch summary

~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: 2009-12-02 23:09:40 UTC
  • mfrom: (4853.1.1 whitespace)
  • mto: This revision was merged to the branch mainline in revision 4856.
  • Revision ID: john@arbash-meinel.com-20091202230940-7n2aydoxngdqxzld
Strip trailing whitespace from doc files by Patrick Regan.

Resolve one small conflict with another doc edit.
Also, revert the changes to all the .pdf and .png files. We shouldn't
be touching them as they are pure-binary files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/ru/user-guide/specifying_revisions.txt
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