log tests/test-evolve-content-divergent-meta.t @ 5067:e07f6af3cfec

age author description
Fri, 13 Dec 2019 01:29:27 +0530 Sushil khanchi evolve: move a test where it makes more sense
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
Sun, 05 May 2019 18:24:59 +0530 Sushil khanchi evolve: consider using three way merge to get the user for div resolution
Sun, 05 May 2019 18:24:50 +0530 Sushil khanchi evolve: add tests for the case when div csets has different users
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)
Tue, 23 Apr 2019 12:28:32 +0200 Pierre-Yves David test-compat: adapt test output to 4.4 mercurial-4.4
Wed, 10 Apr 2019 20:24:55 +0200 Pierre-Yves David test: rename test about content divergent meta data base tests/test-evolve-content-divergence-meta.t@1de40fbeb619