diff tests/test-merge1.out @ 3102:36b08cd92fb7

merge: add codes to action list, eliminate None elements
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:24:00 -0500
parents a31557193f3c
children 966632304dde 49966b5ab16f
line wrap: on
line diff