comparison tests/test-merge1.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 a31557193f3c
children 966632304dde 49966b5ab16f
comparison
equal deleted inserted replaced
3102:36b08cd92fb7 3103:22336ad45cf2