diff tests/test-merge5.out @ 3530:cd2216599c99

minor hg grep simplification
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Oct 2006 23:59:21 -0500
parents 49988d9f0758
children 41989e55fa37
line wrap: on
line diff