diff hgeditor @ 3314:ecc1bf27378c

merge: unify merge and copy actions
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:41:55 -0500
parents d9b8d28c0b94
children 7a7d4937272b
line wrap: on
line diff