Mercurial > hg
comparison tests/test-merge-tools.t @ 17492:973c2b0b403c
spelling: nonexistent
| author | timeless@mozdev.org |
|---|---|
| date | Fri, 17 Aug 2012 13:58:18 -0700 |
| parents | 5efe9c6a34fe |
| children | 9a2cf955db84 |
comparison
equal
deleted
inserted
replaced
| 17491:fd28974f6f66 | 17492:973c2b0b403c |
|---|---|
| 189 $ beforemerge | 189 $ beforemerge |
| 190 [merge-tools] | 190 [merge-tools] |
| 191 false.whatever= | 191 false.whatever= |
| 192 true.priority=1 | 192 true.priority=1 |
| 193 # hg update -C 1 | 193 # hg update -C 1 |
| 194 $ hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool | 194 $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool |
| 195 merging f | 195 merging f |
| 196 merging f failed! | 196 merging f failed! |
| 197 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 197 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 198 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 198 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 199 [1] | 199 [1] |
| 210 $ beforemerge | 210 $ beforemerge |
| 211 [merge-tools] | 211 [merge-tools] |
| 212 false.whatever= | 212 false.whatever= |
| 213 true.priority=1 | 213 true.priority=1 |
| 214 # hg update -C 1 | 214 # hg update -C 1 |
| 215 $ hg merge -r 2 --config merge-tools.true.executable=/nonexisting/mergetool | 215 $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool |
| 216 merging f | 216 merging f |
| 217 merging f failed! | 217 merging f failed! |
| 218 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 218 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 219 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 219 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 220 [1] | 220 [1] |
| 334 [merge-tools] | 334 [merge-tools] |
| 335 false.whatever= | 335 false.whatever= |
| 336 true.priority=1 | 336 true.priority=1 |
| 337 true.executable=cat | 337 true.executable=cat |
| 338 # hg update -C 1 | 338 # hg update -C 1 |
| 339 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | 339 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
| 340 couldn't find merge tool true specified for f | 340 couldn't find merge tool true specified for f |
| 341 merging f | 341 merging f |
| 342 merging f failed! | 342 merging f failed! |
| 343 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 343 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 344 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 344 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 357 [merge-tools] | 357 [merge-tools] |
| 358 false.whatever= | 358 false.whatever= |
| 359 true.priority=1 | 359 true.priority=1 |
| 360 true.executable=cat | 360 true.executable=cat |
| 361 # hg update -C 1 | 361 # hg update -C 1 |
| 362 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexisting/mergetool | 362 $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
| 363 couldn't find merge tool true specified for f | 363 couldn't find merge tool true specified for f |
| 364 merging f | 364 merging f |
| 365 merging f failed! | 365 merging f failed! |
| 366 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 366 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 367 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 367 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |