diff hgmerge @ 3785:1427949b8f80

imported patch folding
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Dec 2006 17:10:29 -0600
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff