Merge lp://staging/~nmb/bzr/fix-486892 into lp://staging/bzr

Proposed by Neil Martinsen-Burrell
Status: Merged
Approved by: Martin Pool
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://staging/~nmb/bzr/fix-486892
Merge into: lp://staging/bzr
Diff against target: 12 lines (+1/-1)
1 file modified
doc/en/user-guide/undoing_mistakes.txt (+1/-1)
To merge this branch: bzr merge lp://staging/~nmb/bzr/fix-486892
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+15159@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

This fixes a broken link in the User Guide: "adv_merging" vs. "advanced_merging" (486892)

Revision history for this message
Martin Pool (mbp) wrote :

That is indeed the correct name

review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

review: approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/en/user-guide/undoing_mistakes.txt'
2--- doc/en/user-guide/undoing_mistakes.txt 2009-09-09 15:06:00 +0000
3+++ doc/en/user-guide/undoing_mistakes.txt 2009-11-23 15:45:28 +0000
4@@ -134,7 +134,7 @@
5 which is probably only what you want if you haven't made any new commits
6 since then. If you have, the ``revert`` would wipe them out as well. In that
7 case, you probably want to use `Reverse cherrypicking
8-<advanced_merging.html#reverse-cherrypicking>`_ instead to
9+<adv_merging.html#reverse-cherrypicking>`_ instead to
10 back out the bad fix.
11
12 Note: As an alternative to using an absolute revision number (like 19), you can