Mercurial > hg-stable
comparison tests/test-resolve.t @ 12788:de793925862e
merge: implement --tool arguments using new ui.forcemerge configurable
ui.forcemerge is set before calling into merge or resolve commands, then unset
to prevent ui pollution for further operations.
ui.forcemerge takes precedence over HGMERGE, but mimics HGMERGE behavior if the
given --tool is not found by the merge-tools machinery. This makes it possible
to do: hg resolve --tool="python mymerge.py" FILE
With this approach, HGMERGE and ui.merge are not harmed by --tool
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Tue, 19 Oct 2010 22:33:52 -0500 |
| parents | 4134686b83e1 |
| children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
| 12784:763be3cd084a | 12788:de793925862e |
|---|---|
| 19 $ hg commit -Am 'append baz' | 19 $ hg commit -Am 'append baz' |
| 20 created new head | 20 created new head |
| 21 | 21 |
| 22 failing merge | 22 failing merge |
| 23 | 23 |
| 24 $ HGMERGE=internal:fail hg merge | 24 $ hg merge --tool=internal:fail |
| 25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 26 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 26 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 27 [1] | 27 [1] |
| 28 | 28 |
| 29 $ echo resolved > file | 29 $ echo resolved > file |