Show More
@@ -28,6 +28,7 b' def internaltool(name, trymerge, onfailu' | |||||
28 | fullname = 'internal:' + name |
|
28 | fullname = 'internal:' + name | |
29 | func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() |
|
29 | func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip() | |
30 | internals[fullname] = func |
|
30 | internals[fullname] = func | |
|
31 | internals[':' + name] = func | |||
31 | func.trymerge = trymerge |
|
32 | func.trymerge = trymerge | |
32 | func.onfailure = onfailure |
|
33 | func.onfailure = onfailure | |
33 | return func |
|
34 | return func |
@@ -425,7 +425,7 b' ui.merge specifies internal:fail:' | |||||
425 | # hg stat |
|
425 | # hg stat | |
426 | M f |
|
426 | M f | |
427 |
|
427 | |||
428 |
ui.merge specifies |
|
428 | ui.merge specifies :local (without internal prefix): | |
429 |
|
429 | |||
430 | $ beforemerge |
|
430 | $ beforemerge | |
431 | [merge-tools] |
|
431 | [merge-tools] | |
@@ -433,7 +433,7 b' ui.merge specifies internal:local:' | |||||
433 | true.priority=1 |
|
433 | true.priority=1 | |
434 | true.executable=cat |
|
434 | true.executable=cat | |
435 | # hg update -C 1 |
|
435 | # hg update -C 1 | |
436 |
$ hg merge -r 2 --config ui.merge= |
|
436 | $ hg merge -r 2 --config ui.merge=:local | |
437 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
437 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
438 | (branch merge, don't forget to commit) |
|
438 | (branch merge, don't forget to commit) | |
439 | $ aftermerge |
|
439 | $ aftermerge |
General Comments 0
You need to be logged in to leave comments.
Login now