only_committed_changes could fail in a git repository merged with git merge -s ours.
[ikiwiki.git] / debian / changelog
index d9134259537e37898f412de405c729929dffaa0a..0c36baf606f977e684d64d05e4321980fe1d98bf 100644 (file)
@@ -1,3 +1,10 @@
+ikiwiki (3.20140228) UNRELEASED; urgency=medium
+
+  * only_committed_changes could fail in a git repository merged
+    with git merge -s ours.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 05 Apr 2014 19:08:22 -0400
+
 ikiwiki (3.20140227) unstable; urgency=medium
 
   * Added useragent config setting. Closes: #737121
 ikiwiki (3.20140227) unstable; urgency=medium
 
   * Added useragent config setting. Closes: #737121