Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 48708 25d5dffbb211
parent 48707 48aff31e7f4c
child 48711 9bc86adf32f6
equal deleted inserted replaced
48707:48aff31e7f4c 48708:25d5dffbb211 
   486                         b'remote path conflict',
 
   486                         b'remote path conflict',
 
   487                     )
 
   487                     )
 
   488                 mresult.addfile(
 
   488                 mresult.addfile(
 
   489                     p,
 
   489                     p,
 
   490                     mergestatemod.ACTION_PATH_CONFLICT,
 
   490                     mergestatemod.ACTION_PATH_CONFLICT,
 
   491                     (pnew, mergestatemod.ACTION_REMOVE),
 
   491                     (pnew, b'r'),
 
   492                     b'path conflict',
 
   492                     b'path conflict',
 
   493                 )
 
   493                 )
 
   494                 remoteconflicts.remove(p)
 
   494                 remoteconflicts.remove(p)
 
   495                 break
 
   495                 break
 
   496 
   496
mercurial