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