Mercurial > evolve

comparison 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
comparison
equal deleted inserted replaced
5757:25257b1be6c6 5823:fd039a7f0c3c
7 $ cat >> $HGRCPATH <<EOF 7 $ cat >> $HGRCPATH <<EOF
8 > [ui] 8 > [ui]
9 > interactive=false 9 > interactive=false
10 > merge=internal:merge 10 > merge=internal:merge
11 > promptecho = True 11 > promptecho = True
12 > [defaults]
13 > amend=-d "0 0"
14 > [merge-tools] 12 > [merge-tools]
15 > touch.checkchanged=true 13 > touch.checkchanged=true
16 > touch.gui=true 14 > touch.gui=true
17 > touch.args=babar 15 > touch.args=babar
18 > [extensions] 16 > [extensions]