Mercurial > evolve
comparison tests/test-push-checkheads-pruned-B5.t @ 3395:02192ac8ef98
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 | 8feb2cae7eae |
| children | ccfcacc5ee7c 2e703ed1c713 |
comparison
equal
deleted
inserted
replaced
| 3394:d1486760fb8d | 3395:02192ac8ef98 |
|---|