Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add a test demonstrating we still use graft in conflict markers
authorPulkit Goyal <7895pulkit@gmail.com>
Thu, 11 Jan 2018 18:38:09 +0530
changeset 3394 d1486760fb8d
parent 3393 a29d063d09e1
child 3395 02192ac8ef98
tests: add a test demonstrating we still use graft in conflict markers This patch adds a test which shows that we still use the word graft in the conflict markers. Next patch will start using evolve instead of graft.
tests/test-evolve-phase.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve-phase.t	Wed Jan 10 15:59:35 2018 +0530
+++ b/tests/test-evolve-phase.t	Thu Jan 11 18:38:09 2018 +0530
@@ -91,6 +91,17 @@
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
+  $ hg diff
+  diff -r 87495ea7c9ec a
+  --- 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
+   b2
+  +=======
+  +c
+  +>>>>>>> graft: 13833940840c - test: c
+
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)
   |
evolve