diff tests/test-simple-update.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 9d1c3529ebbc
children 8feb33c2d153
line wrap: on
line diff