comparison tests/test-merge7 @ 3810:1d571ed26eed

Update tests
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Dec 2006 13:13:44 -0600
parents e506c14382fd
children c0b449154a90
comparison
equal deleted inserted replaced
3809:4d93b37b5963 3810:1d571ed26eed