diff hgmerge @ 3928:4df475e22248

Sync with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 21:48:22 -0600
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff