comparison tests/test-merge4 @ 679:c11e9a6777ae

Actually move .hg into ignore
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Jul 2005 10:28:20 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
comparison
equal deleted inserted replaced
678:0cfc5966b2c2 679:c11e9a6777ae