[PATCH 2 of 5] merge: define conflict marker labels in filemerge()

Durham Goode durham at fb.com
Fri May 9 20:50:32 CDT 2014


On 5/8/14, 5:33 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1399592253 25200
> #      Thu May 08 16:37:33 2014 -0700
> # Node ID 7ff0390bd790e788b91b85dee7fecd00d588ba4f
> # Parent  86c73023576a450fd7c61a22cdb9fb82ad504e4b
> 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.
>
Looks like these first two were queued by someone.


More information about the Mercurial-devel mailing list