Show More
@@ -976,7 +976,7 b' class localrepository(repo.repository):' | |||||
976 | for f in changes[0]: |
|
976 | for f in changes[0]: | |
977 | if f in ms and ms[f] == 'u': |
|
977 | if f in ms and ms[f] == 'u': | |
978 | raise util.Abort(_("unresolved merge conflicts " |
|
978 | raise util.Abort(_("unresolved merge conflicts " | |
979 |
|
|
979 | "(see hg help resolve)")) | |
980 |
|
980 | |||
981 | cctx = context.workingctx(self, text, user, date, extra, changes) |
|
981 | cctx = context.workingctx(self, text, user, date, extra, changes) | |
982 | if editor: |
|
982 | if editor: |
@@ -38,7 +38,7 b' Correct the conflict without marking the' | |||||
38 |
|
38 | |||
39 | $ echo "ABCD" > A |
|
39 | $ echo "ABCD" > A | |
40 | $ hg commit -m "Merged" |
|
40 | $ hg commit -m "Merged" | |
41 | abort: unresolved merge conflicts (see hg resolve) |
|
41 | abort: unresolved merge conflicts (see hg help resolve) | |
42 | [255] |
|
42 | [255] | |
43 |
|
43 | |||
44 | Mark the conflict as resolved and commit |
|
44 | Mark the conflict as resolved and commit |
@@ -65,7 +65,7 b' Conflicting rebase:' | |||||
65 | Try to continue without solving the conflict: |
|
65 | Try to continue without solving the conflict: | |
66 |
|
66 | |||
67 | $ hg rebase --continue |
|
67 | $ hg rebase --continue | |
68 | abort: unresolved merge conflicts (see hg resolve) |
|
68 | abort: unresolved merge conflicts (see hg help resolve) | |
69 | [255] |
|
69 | [255] | |
70 |
|
70 | |||
71 | Conclude rebase: |
|
71 | Conclude rebase: |
General Comments 0
You need to be logged in to leave comments.
Login now