comparison tests/test-up-local-change.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 92a0c2200e41
children 40e777bda455
comparison
equal deleted inserted replaced
3102:36b08cd92fb7 3103:22336ad45cf2