diff contrib/simplemerge @ 22133:d732ff677b96

test-revert: add case where file is added between "base" and "parent"
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 25 Jun 2014 17:37:13 +0100
parents f18830651811
children 56b2bcea2529
line wrap: on
line diff