summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b676c3c3d..db23decbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (3.20111212) UNRELEASED; urgency=low
+
+ * Union merge now finds the least expensive way to represent the merge.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400
+
git-annex (3.20111211) unstable; urgency=medium
* Fix bug in last version in getting contents from bare repositories.