largefiles: don't prompt when one side of merge was changed but didn't change This can happen after backout or grafts or criss cross merges. We already do the same (but slightly different) thing in manifestmerge and filemerge.

color: fallback and test label as an effect With this changeset, we can now send a color name directly to the label function, e.g. $ hg log -r . -T "{label('red', node|short)}\n"

color: extract method for determining a valid effect This patch is just setup work so that we can reduce code duplication and have one place to define a valid effect.

revlog: use context ancestor instead of changelog ancestor We want to move in this direction.

copies: guard debug section with ui.debugflag

copies: remove _checkcopies wrapper - it does no good mergecopies might be doomed but it is not dead yet ...

transplant: use context ancestor instead of changelog ancestor We want to move in this direction. ctx.ancestor is in a better position for handling a situation with multiple ancestors.

commit: use revlog.commonancestors instead of .ancestor This do probably not make any real difference but is slightly more correct and we would like to get rid of flog.ancestor.

backout: don't limit heritage check to a single ancestor This do probably not make any real difference but is slightly more correct and we would like to get rid of changelog.ancestor.

ancestor: remove unused genericancestor