Mercurial > public > mercurial-scm > hg-stable

diff tests/test-help.t @ 26224:a4da463df6cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add non-interactive :merge-local and :merge-other There are two non-interactive internal merge tools, :other and :local, but they don't really merge, they just pick all changes from the local or other version of the file. In some situations, it is known that we want a merge and also know that all merge conflicts should be resolved in one direction. Although external merge tools can do this, sometimes it can be convenient to do so from within hg, without invoking a merge tool. These new :merge-local and :merge-other tools can do just that.
author Jordi Guti?rrez Hermoso <jordigh@octave.org>
date Thu, 10 Sep 2015 09:41:11 -0400
parents 6832ba528d1a
children 1c6f7cc52da9
line wrap: on
line diff
--- a/tests/test-help.t	Wed Aug 12 08:53:01 2015 -0400
+++ b/tests/test-help.t	Thu Sep 10 09:41:11 2015 -0400
@@ -1220,6 +1220,14 @@
         partially merged file. Markers will have two sections, one for each side
         of merge.
   
+      ":merge-local"
+        Like :merge, but resolve all conflicts non-interactively in favor of the
+        local changes.
+  
+      ":merge-other"
+        Like :merge, but resolve all conflicts non-interactively in favor of the
+        other changes.
+  
       ":merge3"
         Uses the internal non-interactive simple merge algorithm for merging
         files. It will fail if there are any conflicts and leave markers in the