Mercurial > public > mercurial-scm > hg

diff contrib/simplemerge @ 22023:f18830651811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: burn "minimal" feature to the ground Matt Mackall said: The goal of simplemerge should have always been to be a drop-in replacement for RCS merge. Please nuke this minimization thing entirely. This whole things is now dead.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 05 Aug 2014 14:56:25 -0700
parents 9de689d20230
children 56b2bcea2529
line wrap: on
line diff
--- a/contrib/simplemerge	Tue Jul 29 11:55:01 2014 -0700
+++ b/contrib/simplemerge	Tue Aug 05 14:56:25 2014 -0700
@@ -11,8 +11,7 @@
            ('a', 'text', None, _('treat all files as text')),
            ('p', 'print', None,
             _('print results instead of overwriting LOCAL')),
-           ('', 'no-minimal', None,
-            _('do not try to minimize conflict regions')),
+           ('', 'no-minimal', None, _('no effect (DEPRECATED)')),
            ('h', 'help', None, _('display help and exit')),
            ('q', 'quiet', None, _('suppress output'))]