245 """ |
245 """ |
246 Uses the internal non-interactive simple merge algorithm for merging |
246 Uses the internal non-interactive simple merge algorithm for merging |
247 files. It will fail if there are any conflicts and leave markers in |
247 files. It will fail if there are any conflicts and leave markers in |
248 the partially merged file. Markers will have two sections, one for each side |
248 the partially merged file. Markers will have two sections, one for each side |
249 of merge, unless mode equals 'union' which suppresses the markers.""" |
249 of merge, unless mode equals 'union' which suppresses the markers.""" |
250 r = 1 |
250 a, b, c, back = files |
251 if r: |
251 |
252 a, b, c, back = files |
252 ui = repo.ui |
253 |
253 |
254 ui = repo.ui |
254 r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) |
255 |
255 return True, r |
256 r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) |
|
257 return True, r |
|
258 return False, 0 |
|
259 |
256 |
260 @internaltool('union', fullmerge, |
257 @internaltool('union', fullmerge, |
261 _("merging %s incomplete! " |
258 _("merging %s incomplete! " |
262 "(edit conflicts, then use 'hg resolve --mark')\n"), |
259 "(edit conflicts, then use 'hg resolve --mark')\n"), |
263 precheck=_symlinkcheck) |
260 precheck=_symlinkcheck) |