equal
deleted
inserted
replaced
189 raise error.ConfigError(_("%s.premerge not valid " |
189 raise error.ConfigError(_("%s.premerge not valid " |
190 "('%s' is neither boolean nor %s)") % |
190 "('%s' is neither boolean nor %s)") % |
191 (tool, premerge, _valid)) |
191 (tool, premerge, _valid)) |
192 |
192 |
193 if premerge: |
193 if premerge: |
194 r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels) |
194 r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels, |
|
195 no_minimal=True) |
195 if not r: |
196 if not r: |
196 ui.debug(" premerge successful\n") |
197 ui.debug(" premerge successful\n") |
197 return 0 |
198 return 0 |
198 if premerge != 'keep': |
199 if premerge != 'keep': |
199 util.copyfile(back, a) # restore from backup and try again |
200 util.copyfile(back, a) # restore from backup and try again |