Mercurial > evolve

comparison tests/test-evolve-phase.t @ 3395:02192ac8ef98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 11 Jan 2018 18:36:05 +0530
parents d1486760fb8d
children e1f3e43a50a4
comparison
equal deleted inserted replaced
3394:d1486760fb8d 3395:02192ac8ef98
94 $ hg diff 94 $ hg diff
95 diff -r 87495ea7c9ec a 95 diff -r 87495ea7c9ec a
96 --- a/a Thu Jan 01 00:00:00 1970 +0000 96 --- a/a Thu Jan 01 00:00:00 1970 +0000
97 +++ b/a Thu Jan 01 00:00:00 1970 +0000 97 +++ b/a Thu Jan 01 00:00:00 1970 +0000
98 @@ -1,1 +1,5 @@ 98 @@ -1,1 +1,5 @@
99 +<<<<<<< local: 87495ea7c9ec - test: b 99 +<<<<<<< destination: 87495ea7c9ec - test: b
100 b2 100 b2
101 +======= 101 +=======
102 +c 102 +c
103 +>>>>>>> graft: 13833940840c - test: c 103 +>>>>>>> evolving: 13833940840c - test: c
104 104
105 $ hg glog 105 $ hg glog
106 @ 3 - 87495ea7c9ec b (draft) 106 @ 3 - 87495ea7c9ec b (draft)
107 | 107 |
108 | * 2 - 13833940840c c (secret) 108 | * 2 - 13833940840c c (secret)