diff tests/test-conflict.out @ 679:c11e9a6777ae

Actually move .hg into ignore
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jul 2005 10:28:20 -0800
parents eb46971fc57f
children c5df1a9c5276
line wrap: on
line diff