Mercurial > public > mercurial-scm > hg-stable

diff tests/test-help.t @ 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 9de443515f1d
children 9b70eda7529c
line wrap: on
line diff
--- a/tests/test-help.t	Sun Aug 16 00:24:29 2015 +0200
+++ b/tests/test-help.t	Sun Aug 16 10:19:00 2015 +0200
@@ -1202,6 +1202,11 @@
       ":tagmerge"
         Uses the internal tag merge algorithm (experimental).
   
+      ":union"
+        Uses the internal non-interactive simple merge algorithm for merging
+        files. It will use both left and right sides for conflict regions. No
+        markers are inserted.
+  
       Internal tools are always available and do not require a GUI but will by
       default not handle symlinks or binary files.