diff options
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/bzr | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index f4907063d0b..8720982e0aa 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr | |||
| @@ -76,9 +76,8 @@ a similar way with unbound ones. | |||
| 76 | (this will be included by default in bzr 2.4 onwards): | 76 | (this will be included by default in bzr 2.4 onwards): |
| 77 | 77 | ||
| 78 | cd ~/.bazaar/plugins | 78 | cd ~/.bazaar/plugins |
| 79 | # The following is an improved version of: lp:bzr-changelog-merge | 79 | bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk |
| 80 | bzr branch lp:~spiv/bzr-changelog-merge/non-head-edits-723968 | 80 | mv trunk changelog_merge |
| 81 | mv bzr-changelog-merge changelog_merge | ||
| 82 | 81 | ||
| 83 | This should make merging ChangeLogs smoother. It merges new entries | 82 | This should make merging ChangeLogs smoother. It merges new entries |
| 84 | to the top of the file, rather than trying to fit them in mid-way | 83 | to the top of the file, rather than trying to fit them in mid-way |