comparison tests/test-merge-default.out @ 4676:0f6e2b37512d

Merge with Eric Hopper
author Matt Mackall <mpm@selenic.com>
date Thu, 21 Jun 2007 18:05:14 -0500
parents 013921c753bd
children 9cd6578750b9
comparison
equal deleted inserted replaced
4674:723e0ddb6ada 4676:0f6e2b37512d