diff hg @ 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 ad4a2eefe4d7
children abaee83ce0a6
line wrap: on
line diff