comparison mercurial/dirstate.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 345bac2bc4ec
children 3d5547845158
comparison
equal deleted inserted replaced
2916:834e147842d7 2917:dd032b0f02ac