Mercurial > hg
diff mercurial/fileset.py @ 26071:ff12a6c63c3d
filemerge: add 'union' merge to 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 e.g. the Changelog file.
| author | Erik Huelsmann <ehuels@gmail.com> |
|---|---|
| date | Sun, 16 Aug 2015 10:19:00 +0200 |
| parents | a7527c5769bb |
| children | fc65d63ef3b9 |