diff hgmerge @ 3416:145a8fde69e6

Update branch on checkout/update
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:30:20 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff