diff tests/test-diffdir.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 7544700fd931
children 000d122071b5
line wrap: on
line diff