Mercurial > hg
comparison mercurial/demandimport.py @ 21273:20b8090d8125
merge: define conflict marker labels in filemerge()
Moves the conflict marker definition up to filemerge, so it gets applied to all
merge strategies, and so in a future patch we can manipulate the markers.
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 08 May 2014 16:37:33 -0700 |
parents | 54af51c18c4c |
children | 74be3fb1e3b8 |
comparison
equal
deleted
inserted
replaced
21272:4aeb7a6029ba | 21273:20b8090d8125 |
---|