view tests/test-mq-qnew-twice.out @ 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 85070b784896
children
line wrap: on
line source

abort: patch "first.patch" already exists
abort: patch "first.patch" already exists