# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1345737688 -7200
# Node ID 595ae87e94b64df035716a83a0603e509acb6153
# Parent  2111c655b4f53cdc5b65c11aec386f36015a5ee1
update changelog

diff -r 2111c655b4f5 -r 595ae87e94b6 README
--- a/README	Thu Aug 23 18:00:29 2012 +0200
+++ b/README	Thu Aug 23 18:01:28 2012 +0200
@@ -48,6 +48,7 @@
 - Align with Mercurial version 2.3 (drop 2.2 support).
 - stabilize handle killed parent
 - stabilize handle late comer
+- stabilize handle conflicting
 - stabilize get a --continue switch
 - merge and update ignore extinct changeset in most case.
 - new "troubled()" revset