diff tests/test-merge6.out @ 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 b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff