| changeset 21921 | ecc1387138ba |
| parent 21918 | 10abc3a5c6b2 |
| child 21922 | 50e20154cb68 |
| 21920:1d04d3fe616d | 21921:ecc1387138ba |
|---|---|
215 if r: |
215 if r: |
216 a, b, c, back = files |
216 a, b, c, back = files |
217 |
217 |
218 ui = repo.ui |
218 ui = repo.ui |
219 |
219 |
220 r = simplemerge.simplemerge(ui, a, b, c, label=labels) |
220 r = simplemerge.simplemerge(ui, a, b, c, label=labels, no_minimal=True) |
221 return True, r |
221 return True, r |
222 return False, 0 |
222 return False, 0 |
223 |
223 |
224 @internaltool('dump', True) |
224 @internaltool('dump', True) |
225 def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
225 def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |