summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 98c0383..614a576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ dgit (6.7~) unstable; urgency=medium
not in series, because they will be deleted. Closes:#904997.
* changelog: Add close note for #905400 to changelog entry for 6.5.
* git-debrebase: convert-from-gbp: Improve messages. Closes:#906641.
+ * git-debrebase: Highly experimental merge resolution support,
+ enabled only with special command line option.
--