diff tests/test-merge4.out @ 1363:8549335d19fc

Merge with self
author Matt Mackall <mpm@selenic.com>
date Thu, 29 Sep 2005 13:20:03 -0700
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line diff