equal
deleted
inserted
replaced
1135 |
1135 |
1136 return ret |
1136 return ret |
1137 |
1137 |
1138 |
1138 |
1139 def merge( |
1139 def merge( |
1140 repo, node, force=None, remind=True, mergeforce=False, labels=None, |
1140 repo, node, force=False, remind=True, mergeforce=False, 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.update( |
1145 repo, |
1145 repo, |