diff tests/test-merge6.out @ 3110:40e777bda455

merge: remove linear variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 17:13:02 -0500
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff