Mercurial > hg

comparison tests/test-merge-tools @ 8901:94319ae527cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test merge-tools internal:dump and internal:prompt
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 21 Jun 2009 03:11:52 +0200
parents 0941ee76489e
children 08a0f04b56bd
comparison
equal deleted inserted replaced
8900:589a3d022079 8901:94319ae527cf
119 domerge -r 2 --config ui.merge=internal:local 119 domerge -r 2 --config ui.merge=internal:local
120 120
121 echo "# ui.merge specifies internal:other:" 121 echo "# ui.merge specifies internal:other:"
122 domerge -r 2 --config ui.merge=internal:other 122 domerge -r 2 --config ui.merge=internal:other
123 123
124 echo "# ui.merge specifies internal:prompt:"
125 domerge -r 2 --config ui.merge=internal:prompt
126
127 echo "# ui.merge specifies internal:dump:"
128 domerge -r 2 --config ui.merge=internal:dump
129 echo f.base:
130 cat f.base
131 echo f.local:
132 cat f.local
133 echo f.other:
134 cat f.other
135 rm f.base f.local f.other
136 echo
137
124 echo "# ui.merge specifies internal:other but is overruled by pattern for false:" 138 echo "# ui.merge specifies internal:other but is overruled by pattern for false:"
125 domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false 139 domerge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
126 140
127 echo 141 echo
128 echo Premerge 142 echo Premerge