equal
deleted
inserted
replaced
1139 def merge( |
1139 def merge( |
1140 repo, node, force=False, remind=True, labels=None, |
1140 repo, node, force=False, remind=True, labels=None, |
1141 ): |
1141 ): |
1142 """Branch merge with node, resolving changes. Return true if any |
1142 """Branch merge with node, resolving changes. Return true if any |
1143 unresolved conflicts.""" |
1143 unresolved conflicts.""" |
1144 stats = mergemod.update( |
1144 stats = mergemod.merge(repo[node], force=force, labels=labels) |
1145 repo, |
|
1146 node, |
|
1147 branchmerge=True, |
|
1148 force=force, |
|
1149 mergeforce=force, |
|
1150 labels=labels, |
|
1151 ) |
|
1152 _showstats(repo, stats) |
1145 _showstats(repo, stats) |
1153 if stats.unresolvedcount: |
1146 if stats.unresolvedcount: |
1154 repo.ui.status( |
1147 repo.ui.status( |
1155 _( |
1148 _( |
1156 b"use 'hg resolve' to retry unresolved file merges " |
1149 b"use 'hg resolve' to retry unresolved file merges " |