log tests/test-evolve-content-divergent-relocation.t @ 4754:75307f276a79

age author description
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Wed, 05 Jun 2019 17:56:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 05 Jun 2019 17:45:45 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 26 Apr 2019 01:20:08 +0530 Sushil khanchi evolve: move status msg to verbose mode in content-divergence resolution
Wed, 24 Apr 2019 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
Thu, 11 Apr 2019 22:44:53 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Thu, 11 Apr 2019 22:42:13 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Thu, 11 Apr 2019 22:41:41 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7 base tests/test-evolve-content-divergence.t@52bb5b1b3224
Wed, 10 Apr 2019 16:59:28 +0200 Pierre-Yves David branching: merge with test consolidation base tests/test-evolve-content-divergence.t@37af88986be5
Wed, 10 Apr 2019 14:32:00 +0200 Pierre-Yves David test: consolidate the content-divergent test cases stable base tests/test-evolve-content-divergence.t@98e4858881ed