diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-05-14 12:09:37 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-05-14 12:09:37 -0700 |
| commit | dc5e0b5aace520e202bbbcdf0e728a4bdc72e043 (patch) | |
| tree | 525806834800bdcadcc6559bd35e12ec0b79d6f9 /admin/notes | |
| parent | 1aa64307400a6ec3fad06abb4e3b3094dc320a4a (diff) | |
| download | emacs-dc5e0b5aace520e202bbbcdf0e728a4bdc72e043.tar.gz | |
* admin/notes/bzr: Update changelog_merge branch details.
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. (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 |