diff mercurial/util_win32.py @ 2917:dd032b0f02ac

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