Mercurial > hg
comparison doc/style.css @ 26069:09d6725cbc60
simplemerge: add 'mode' kwarg which - when 'union' - suppresses markers
This is a step toward adding 'union merge' to the internal merge tool.
'union merge' is a merge strategy which adds both left and right hand side
of a conflict region. Git implements this merge strategy which is very
practical to have for merging to e.g. the Changelog file.
Note: the identifiers with underscores in this commit are all using existing
variable names and/or keyword arguments.
author | Erik Huelsmann <ehuels@gmail.com> |
---|---|
date | Sun, 16 Aug 2015 00:00:34 +0200 |
parents | 86531a7038ed |
children | 4b0fc75f9403 |
comparison
equal
deleted
inserted
replaced
26068:05e7f57c74ac | 26069:09d6725cbc60 |
---|