Mercurial > evolve
diff README @ 938:16594198b64a
readme: remove embarrassment
There were… conflict marker in this file. Its over, they are gone now.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 19 May 2014 12:43:03 -0700 |
| parents | 43cceb37324c |
| children | d46ef45810e4 |
line wrap: on
line diff
--- a/README Wed May 14 16:42:41 2014 -0700 +++ b/README Mon May 19 12:43:03 2014 -0700 @@ -86,15 +86,9 @@ 3.3.0 -- 2014-03-04 -<<<<<<< local: 1205:ec4c17e0aee6 (default) -======= base: 1196:fc04758ea9f5 3.3.1 (stable) -- drop `latercomer` and `conflicting` compatibility. Those old alias are - deprecated for a long time now. -======= - raise Mercurial's minimal requirement to 2.7 - drop `latercomer` and `conflicting` compatibility. Those old alias are deprecated for a long time now. ->>>>>>> other: 1240:32915143d448 tip @ (stable) - add verbose hint about how to handle corner case by hand. This should help people until evolve is able to to it itself. - removed the qsync extension. The only user I knew about (logilab) is not