diff hgmerge @ 3737:9f5c46c50118

add a simple nested buffering scheme to ui
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Dec 2006 01:28:18 -0600
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff