diff mercurial/simplemerge.py @ 11813:6c8e824970d1

tests: unify test-parents
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 12 Aug 2010 23:27:32 +0900
parents 08a0f04b56bd
children 81c4e18c7cee
line wrap: on
line diff