Mercurial > hg

diff mercurial/ancestor.py @ 21273:20b8090d8125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 64911a12dc28
children baecf4e1b7d0
line wrap: on
line diff