diff tests/test-excessive-merge @ 2567:2748253b49c2

Merge context patches
author Matt Mackall <mpm@selenic.com>
date Wed, 05 Jul 2006 13:28:25 -0500
parents e506c14382fd
children ad3d5b4367cb
line wrap: on
line diff