Show More
@@ -739,6 +739,7 b' def _filemerge(premerge, repo, wctx, myn' | |||||
739 | if r: |
|
739 | if r: | |
740 | if onfailure: |
|
740 | if onfailure: | |
741 | ui.warn(onfailure % fd) |
|
741 | ui.warn(onfailure % fd) | |
|
742 | _onfilemergefailure(ui) | |||
742 |
|
743 | |||
743 | return True, r, deleted |
|
744 | return True, r, deleted | |
744 | finally: |
|
745 | finally: |
@@ -44,8 +44,7 b' Testing on-failure=halt' | |||||
44 | merging a |
|
44 | merging a | |
45 | merging b |
|
45 | merging b | |
46 | merging a failed! |
|
46 | merging a failed! | |
47 | merging b failed! |
|
47 | merge halted after failed merge (see hg resolve) | |
48 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
|||
49 | [1] |
|
48 | [1] | |
50 |
|
49 | |||
51 | $ hg resolve --list |
|
50 | $ hg resolve --list | |
@@ -65,8 +64,10 b' Testing on-failure=prompt' | |||||
65 | merging a |
|
64 | merging a | |
66 | merging b |
|
65 | merging b | |
67 | merging a failed! |
|
66 | merging a failed! | |
|
67 | continue merge operation (yn)? y | |||
68 | merging b failed! |
|
68 | merging b failed! | |
69 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
69 | continue merge operation (yn)? n | |
|
70 | merge halted after failed merge (see hg resolve) | |||
70 | [1] |
|
71 | [1] | |
71 |
|
72 | |||
72 | $ hg resolve --list |
|
73 | $ hg resolve --list |
General Comments 0
You need to be logged in to leave comments.
Login now