diff hgext/evolve.py @ 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 0523c7c63759
line wrap: on
line diff