Show More
@@ -92,8 +92,8 b' echo' | |||||
92 | echo Tool selection and merge-patterns |
|
92 | echo Tool selection and merge-patterns | |
93 | echo |
|
93 | echo | |
94 |
|
94 | |||
95 |
echo "# merge-patterns specifies new tool |
|
95 | echo "# merge-patterns specifies new tool false:" | |
96 |
domerge -r 2 --config merge-patterns.f= |
|
96 | domerge -r 2 --config merge-patterns.f=false | |
97 |
|
97 | |||
98 | echo "# merge-patterns specifies executable not found in PATH and gets warning:" |
|
98 | echo "# merge-patterns specifies executable not found in PATH and gets warning:" | |
99 | domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool |
|
99 | domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool |
@@ -175,27 +175,23 b' M f' | |||||
175 |
|
175 | |||
176 | Tool selection and merge-patterns |
|
176 | Tool selection and merge-patterns | |
177 |
|
177 | |||
178 |
# merge-patterns specifies new tool |
|
178 | # merge-patterns specifies new tool false: | |
179 | [merge-tools] |
|
179 | [merge-tools] | |
180 | false.whatever= |
|
180 | false.whatever= | |
181 | true.priority=1 |
|
181 | true.priority=1 | |
182 | true.executable=cat |
|
182 | true.executable=cat | |
183 | # hg update -C 1 |
|
183 | # hg update -C 1 | |
184 |
# hg merge -r 2 --config merge-patterns.f= |
|
184 | # hg merge -r 2 --config merge-patterns.f=false | |
185 | space |
|
|||
186 | revision 1 |
|
|||
187 | space |
|
|||
188 | revision 0 |
|
|||
189 | space |
|
|||
190 | revision 2 |
|
|||
191 | merging f |
|
185 | merging f | |
192 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
186 | merging f failed! | |
193 | (branch merge, don't forget to commit) |
|
187 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
188 | use 'hg resolve' to retry unresolved file merges | |||
194 | # cat f |
|
189 | # cat f | |
195 | revision 1 |
|
190 | revision 1 | |
196 | space |
|
191 | space | |
197 | # hg stat |
|
192 | # hg stat | |
198 | M f |
|
193 | M f | |
|
194 | ? f.orig | |||
199 |
|
195 | |||
200 | # merge-patterns specifies executable not found in PATH and gets warning: |
|
196 | # merge-patterns specifies executable not found in PATH and gets warning: | |
201 | [merge-tools] |
|
197 | [merge-tools] |
General Comments 0
You need to be logged in to leave comments.
Login now