comparison hgmerge @ 3255:f05c182430a0

merge: add rename following Currently disabled by default, enable with [merge] followcopies = 1
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 15:43:27 -0500
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3254:751840e739a1 3255:f05c182430a0