view tests/test-merge4.out @ 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 b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)