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.
Welcome to Mercurial for Windows!
---------------------------------
For configuration and usage directions, please read the ReadMe.html
file that comes with this package.
Also check the release notes at:
http://mercurial.selenic.com/wiki/WhatsNew