# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1515675965 -19800
# Node ID 02192ac8ef9864c4bfa08dd3534b1112e17348a5
# Parent  d1486760fb8dfceaa6a0aacd6f229475e1b84039
evolve: use better words in conflict markers of `hg evolve`

Though we call merge.graft internally, we still have the functionality to pass
the words we want to show up in conflict markers. So let's use better words
here.

diff -r d1486760fb8d -r 02192ac8ef98 hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Thu Jan 11 18:38:09 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Thu Jan 11 18:36:05 2018 +0530
@@ -2505,4 +2505,4 @@
             with repo.vfs.open('topic', 'w') as f:
                 f.write(orig.topic())
 
-    return merge.graft(repo, orig, pctx, ['local', 'graft'], True)
+    return merge.graft(repo, orig, pctx, ['destination', 'evolving'], True)
diff -r d1486760fb8d -r 02192ac8ef98 tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Thu Jan 11 18:38:09 2018 +0530
+++ b/tests/test-evolve-phase.t	Thu Jan 11 18:36:05 2018 +0530
@@ -96,11 +96,11 @@
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,5 @@
-  +<<<<<<< local: 87495ea7c9ec - test: b
+  +<<<<<<< destination: 87495ea7c9ec - test: b
    b2
   +=======
   +c
-  +>>>>>>> graft: 13833940840c - test: c
+  +>>>>>>> evolving:    13833940840c - test: c
 
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)