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.
ERROR: FIXME: This is a known failure of filelog.size for data starting with \1\n
OK.