log tests/test-evolve-content-divergent-basic.t @ 4873:91116cec0a67 stable

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
Sat, 27 Apr 2019 22:45:16 -0400 Matt Harbison templatekw: add `instabilities` alias for `troubles`
Wed, 24 Apr 2019 16:35:01 +0800 Anton Shestakov tests: add --no-all to hg evolve to reduce test changes
Tue, 23 Apr 2019 12:28:32 +0200 Pierre-Yves David test-compat: adapt test output to 4.4 mercurial-4.4