diff contrib/simplemerge @ 4404:47371e1c1db4

Merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:27:21 -0500
parents d5c3a70f8422
children 1ef4445c6506
line wrap: on
line diff