Mercurial > evolve

changeset 4406:450487b4e1a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update the title of a test as it's not what it says I see that this test has conflict in relocation and in merging also. We do have a test for the case when only relocation leads to conflict.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 22 Feb 2019 23:57:18 +0530
parents 8b91088944ca
children 7fd0cbf6190d
files tests/test-evolve-content-divergence.t
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-content-divergence.t	Wed Feb 13 21:56:29 2019 +0800
+++ b/tests/test-evolve-content-divergence.t	Fri Feb 22 23:57:18 2019 +0530
@@ -595,7 +595,7 @@
   @@ -0,0 +1,1 @@
   +bar
 
-Testing when the relocation will result in conflicts and merging wont
+Testing when the relocation will result in conflicts and merging also:
 ----------------------------------------------------------------------
 
   $ hg glog