diff mercurial/context.py @ 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 345bac2bc4ec
children da85145d4571 81da3c45aabd
line wrap: on
line diff