diff tests/test-evolve-content-divergent-basic.t @ 5820:5341d7c30e68 stable

branching: merge into stable in preparation for release

# no-check-commit

--- a/tests/test-evolve-content-divergent-basic.t	Wed Feb 24 14:30:21 2021 -0800
+++ b/tests/test-evolve-content-divergent-basic.t	Thu Mar 11 11:49:34 2021 +0800
@@ -8,14 +8,6 @@
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) [{branch}] {phase}"
-  > [defaults]
-  > amend=-d "0 0"
-  > fold=-d "0 0"
-  > [web]
-  > push_ssl = false
-  > allow_push = *
-  > [phases]
-  > publish = False
   > [diff]
   > git = 1
   > unified = 0