view tests/test-merge3.out @ 3103:22336ad45cf2

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

removing b
nothing changed