log tests/test-evolve-public-content-divergent-main.t @ 4676:b6c819facbe8

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
Tue, 04 Jun 2019 11:08:44 +0200 Pierre-Yves David branching: merge with stable base tests/test-evolve-public-content-divergent.t@fa4093f7ff5c
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 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
Sun, 14 Apr 2019 02:18:19 +0800 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch
Wed, 17 Apr 2019 00:20:44 +0530 Sushil khanchi tests: consolidate the public-content-divergent test cases base tests/test-evolve-public-content-divergent.t@fa4093f7ff5c