diff tests/test-merge5 @ 3103:22336ad45cf2

merge: add forget to action list
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 15:54:51 -0500
parents 39eb64b23cb5
children 41989e55fa37
line wrap: on
line diff