diff tests/test-merge5 @ 3306:5c9806554d65

merge: finish removing nodes from action list
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:22:03 -0500
parents 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff