[Emacs-diffs] /srv/bzr/emacs/trunk r104228: * admin/notes/bzr: Update changelog_merge branch details.

[Glenn Morris]

------------------------------------------------------------
revno: 104228
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-14 12:09:37 -0700
message:
  * admin/notes/bzr: Update changelog_merge branch details.
modified:
  admin/notes/bzr

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2011-04-26 04:50:33 +0000
+++ b/admin/notes/bzr   2011-05-14 19:09:37 +0000
@@ -76,9 +76,8 @@
 (this will be included by default in bzr 2.4 onwards):
 
 cd ~/.bazaar/plugins
-# The following is an improved version of: lp:bzr-changelog-merge
-bzr branch lp:~spiv/bzr-changelog-merge/non-head-edits-723968
-mv bzr-changelog-merge changelog_merge
+bzr branch http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/trunk 
+mv trunk changelog_merge
 
 This should make merging ChangeLogs smoother.  It merges new entries
 to the top of the file, rather than trying to fit them in mid-way