Added changelog entry

4cdb2443 · Reinout van Rees · dfc63b18 · 4cdb2443
Commit 4cdb2443 authored Nov 24, 2014 by Reinout van Rees
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

CHANGES.rst CHANGES.rst +8 -0

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
 Change History
 **************

+2.2.6 (unreleased)
+==================
+
+- Fix for #212. For certain kinds of conflict errors you'd get an UnpackError
+  when rendering the error message. Instead of a nicely formatted version
+  conflict message.
+  [reinout]
+
 2.2.5 (2014-11-04)
 ==================