diff tests/test-archive @ 3257:c93ce7f10f85

merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 19:08:04 -0500
parents 83cfd95eafb5
children ca023b63ba1f
line wrap: on
line diff