Mercurial > evolve

diff tests/test-stabilize-conflict.t @ 5823:fd039a7f0c3c mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-5.6 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 12:29:50 +0800
parents 8e4f6354b316 a1dad44fe3da
children 664f62e57231 1328195f76a9
line wrap: on
line diff
--- a/tests/test-stabilize-conflict.t	Fri Jan 29 17:23:31 2021 +0800
+++ b/tests/test-stabilize-conflict.t	Thu Mar 11 12:29:50 2021 +0800
@@ -9,8 +9,6 @@
   > interactive=false
   > merge=internal:merge
   > promptecho = True
-  > [defaults]
-  > amend=-d "0 0"
   > [merge-tools]
   > touch.checkchanged=true
   > touch.gui=true