diff tests/test-merge7.out @ 3113:f96c8e219865

merge: remove no longer possible clause
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 18:28:50 -0500
parents 40e777bda455
children 2ef0b3aae186
line wrap: on
line diff