diff tests/test-merge1 @ 2407:8fe3d60b7f19

revert: better fix for not printing 'reverting' message
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 07 Jun 2006 13:16:25 -0700
parents e506c14382fd
children 49966b5ab16f
line wrap: on
line diff