diff contrib/simplemerge @ 20651:c1a52dd56eb4

merge: add blank line between mergestate's method This class is now too big to be a single big block of continuous text.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 05 Mar 2014 10:22:43 -0800
parents 9de689d20230
children f18830651811
line wrap: on
line diff