equal
deleted
inserted
replaced
1140 matcher, |
1140 matcher, |
1141 acceptremote, |
1141 acceptremote, |
1142 followcopies, |
1142 followcopies, |
1143 ) |
1143 ) |
1144 _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce) |
1144 _checkunknownfiles(repo, wctx, mctx, force, mresult, mergeforce) |
|
1145 if repo.ui.configbool(b'devel', b'debug.abort-update'): |
|
1146 exit(1) |
1145 |
1147 |
1146 else: # only when merge.preferancestor=* - the default |
1148 else: # only when merge.preferancestor=* - the default |
1147 repo.ui.note( |
1149 repo.ui.note( |
1148 _(b"note: merging %s and %s using bids from ancestors %s\n") |
1150 _(b"note: merging %s and %s using bids from ancestors %s\n") |
1149 % ( |
1151 % ( |