Show More
@@ -780,7 +780,7 b' def calculateupdates(repo, wctx, mctx, a' | |||||
780 | partial, acceptremote, followcopies) |
|
780 | partial, acceptremote, followcopies) | |
781 |
|
781 | |||
782 | else: # only when merge.preferancestor=* - the default |
|
782 | else: # only when merge.preferancestor=* - the default | |
783 |
repo.ui. |
|
783 | repo.ui.note( | |
784 | _("note: merging %s and %s using bids from ancestors %s\n") % |
|
784 | _("note: merging %s and %s using bids from ancestors %s\n") % | |
785 | (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) |
|
785 | (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) | |
786 |
|
786 |
@@ -210,7 +210,6 b' Verify how the output looks and and how ' | |||||
210 |
|
210 | |||
211 | $ hg up -qC |
|
211 | $ hg up -qC | |
212 | $ hg merge |
|
212 | $ hg merge | |
213 | note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
|
|||
214 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
213 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
215 | (branch merge, don't forget to commit) |
|
214 | (branch merge, don't forget to commit) | |
216 |
|
215 |
General Comments 0
You need to be logged in to leave comments.
Login now