diff hgext/imerge.py @ 5060:2ef14e29e538

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Aug 2007 13:23:53 -0500
parents 34a54cc5df1b
children 420e1166a876
line wrap: on
line diff