[Pkg-bazaar-commits] ./bzr-builddeb/trunk r364: Update changelog.

[James Westby]

------------------------------------------------------------
revno: 364
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Mon 2009-08-24 18:38:49 +0100
message:
  Update changelog.
modified:
  debian/changelog
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-07-26 18:21:49 +0000
+++ b/debian/changelog	2009-08-24 17:38:49 +0000
@@ -4,6 +4,11 @@
   * Automatically use merge mode if there's only a debian/ directory in
     the packaging branch. Closes: #529816.
 
+  [ James Westby ]
+  * Merge merge-package command from Muharem Hrnjadovic to allow merging
+    another branch of the same package in a way that will avoid spurious
+    conflicts from divergent upstream histories. Thanks Muharem.
+
  -- James Westby <james.westby at ubuntu.com>  Sun, 26 Jul 2009 18:38:47 +0200
 
 bzr-builddeb (2.2~ubuntu2) karmic; urgency=low