diff tests/test-diff-subdir @ 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 51b8d1ca7820
children 096f1c73cdc3
line wrap: on
line diff