diff tests/test-merge-default @ 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 013921c753bd
children 9cd6578750b9
line wrap: on
line diff