1193     # default action is 'continue', in which case we neither prompt nor halt

  1193     # default action is 'continue', in which case we neither prompt nor halt

  1194 

  1194 

  1195 

  1195 

  1196 def hasconflictmarkers(data):

  1196 def hasconflictmarkers(data):

  1197     return bool(

  1197     return bool(

  1199     )

  1203     )

  1200 

  1204 

  1201 

  1205 

  1202 def _check(repo, r, ui, tool, fcd, files):

  1206 def _check(repo, r, ui, tool, fcd, files):

  1203     fd = fcd.path()

  1207     fd = fcd.path()