##// END OF EJS Templates
merge: change default of hg.merge()'s "force" argument from None to False...
Martin von Zweigbergk -
r44881:0f60687b default
parent child Browse files
Show More
@@ -1137,7 +1137,7 b' def updatetotally(ui, repo, checkout, br'
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."""
General Comments 0
You need to be logged in to leave comments. Login now