comparison hgmerge @ 3314:ecc1bf27378c

merge: unify merge and copy actions
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:41:55 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3313:f009a6f12a59 3314:ecc1bf27378c