diff tests/test-symlinks.out @ 2897:dd032b0f02ac

merge: move forgets to the apply stage
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 18:30:21 -0500
parents 4e35843b2683
children 9d1c3529ebbc
line wrap: on
line diff