Mercurial > hg

diff README @ 26071:ff12a6c63c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 df5ecb813426
children 4b0fc75f9403
line wrap: on
line diff