diff tests/test-merge-default @ 4356:10edaed7f909

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Apr 2007 12:37:30 -0500
parents 013921c753bd
children 9cd6578750b9
line wrap: on
line diff