diff tests/test-merge-revert2.out @ 2567:2748253b49c2

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