Mercurial > hg
comparison mercurial/merge.py @ 25843:bf9ea348b487
merge: mark ancient debugging option
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 25 Jun 2015 17:53:16 -0500 |
parents | 19cc443aac34 |
children | 18541e9510c5 |
comparison
equal
deleted
inserted
replaced
25842:fa3f0301cf91 | 25843:bf9ea348b487 |
---|---|
1068 raise util.Abort(msg, hint=hint) | 1068 raise util.Abort(msg, hint=hint) |
1069 else: | 1069 else: |
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] |
1076 elif pas == [p2]: # backwards | 1077 elif pas == [p2]: # backwards |
1077 pas = [wc.p1()] | 1078 pas = [wc.p1()] |