Mercurial > public > mercurial-scm > hg

diff tests/test-simplemerge.py.out @ 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 2e3c54fb79a3
children
line wrap: on
line diff
--- a/tests/test-simplemerge.py.out	Tue Jul 29 11:55:01 2014 -0700
+++ b/tests/test-simplemerge.py.out	Tue Aug 05 14:56:25 2014 -0700
@@ -1,5 +1,5 @@
-....................
+................
 ----------------------------------------------------------------------
-Ran 20 tests in 0.000s
+Ran 16 tests in 0.000s
 
 OK