diff contrib/simplemerge @ 8177:c8c231da59c3

Merge with crew-stable
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Apr 2009 16:49:47 -0500
parents a6477aa893b8
children bb9f13974d8e
line wrap: on
line diff