# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1555650113 -19800
# Node ID e7b44e9c38d2b7e78d52ed97daf28299d1a08dd4
# Parent  93c6a274cd83b762a05fc259e14cb01e80d76e30
compat: fix a typo in compat patch

diff -r 93c6a274cd83 -r e7b44e9c38d2 CHANGELOG
--- a/CHANGELOG	Thu Apr 18 23:51:13 2019 +0200
+++ b/CHANGELOG	Fri Apr 19 10:31:53 2019 +0530
@@ -4,8 +4,9 @@
 8.5.1 - in progress
 -------------------
 
-  * topic: compatibility with mercurial-5.0
-  * topic: improve extensions isolation (issue6121)
+  * evolve: make sure we use upstream merge code with 5.0,
+  * topic: compatibility with mercurial-5.0,
+  * topic: improve extensions isolation (issue6121).
 
 8.5.0 -- 2019-04-23
 -------------------
diff -r 93c6a274cd83 -r e7b44e9c38d2 hgext3rd/evolve/compat.py
--- a/hgext3rd/evolve/compat.py	Thu Apr 18 23:51:13 2019 +0200
+++ b/hgext3rd/evolve/compat.py	Fri Apr 19 10:31:53 2019 +0530
@@ -418,7 +418,7 @@
     return copy, movewithdir, diverge, renamedelete, dirmove
 
 # hg <= 4.9 compat (7694b685bb10)
-fixupstreamed = util.safehasattr(scmutil, '_movedirstate')
+fixupstreamed = util.safehasattr(scmutil, 'movedirstate')
 if not fixupstreamed:
     copies._fullcopytracing = fixedcopytracing