diff mercurial/fancyopts.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 bf4e7ef08741
children eb0b4a2d70a9
line wrap: on
line diff