diff contrib/hg-ssh @ 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 9a5b778f7e2d
children 831ebc408ffb
line wrap: on
line diff