# HG changeset patch # User Sushil khanchi # Date 1550860038 -19800 # Node ID 450487b4e1a32dd1a1afd82f781caa810d6d40ec # Parent 8b91088944caf40a057c53c962717d7092a8f262 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. diff -r 8b91088944ca -r 450487b4e1a3 tests/test-evolve-content-divergence.t --- 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