changeset 4406 | 450487b4e1a3 |
parent 4181 | ab3581bc0637 |
child 4407 | 7fd0cbf6190d |
--- 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