diff mercurial/merge.py @ 13316:d119403fd266

util: delay loading of textwrap
author Matt Mackall <mpm@selenic.com>
date Fri, 28 Jan 2011 17:02:29 -0600
parents 6bf39d88c857
children d8d478f9ee0f
line wrap: on
line diff