diff tests/test-merge-local @ 10609:5ee3faa7c563

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 07 Mar 2010 22:04:35 -0600
parents 46280c004f22
children 4c94b6d0fb1c
line wrap: on
line diff