changeset 487:595ae87e94b6

update changelog
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 23 Aug 2012 18:01:28 +0200
parents 2111c655b4f5
children fdf3ae486e01
files README
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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