##// END OF EJS Templates
merge: mark ancient debugging option
Matt Mackall -
r25843:bf9ea348 default
parent child Browse files
Show More
@@ -1070,6 +1070,7 def update(repo, node, branchmerge, forc
1070 # Allow jumping branches if clean and specific rev given
1070 # Allow jumping branches if clean and specific rev given
1071 pas = [p1]
1071 pas = [p1]
1072
1072
1073 # deprecated config: merge.followcopies
1073 followcopies = False
1074 followcopies = False
1074 if overwrite:
1075 if overwrite:
1075 pas = [wc]
1076 pas = [wc]
General Comments 0
You need to be logged in to leave comments. Login now