log tests/test-evolve-public-content-divergent-discard.t @ 4946:bd992b1d4426

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
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`
Sat, 09 Mar 2019 19:35:45 +0530 Sushil khanchi evolve: warn user for the metadata being lost in public divergence resolution
Wed, 17 Apr 2019 21:16:17 +0530 Sushil khanchi evolve: show a status message when merging leads to public cset
Wed, 24 Apr 2019 20:32:01 +0200 Pierre-Yves David test: use a shorter test name base tests/test-evolve-public-content-divergent-mergingleadstopublic.t@b3099e8796bc