view tests/test-merge8.out @ 3716:ab5600428b08

handle files with both git binary patches and copy/rename ops
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Nov 2006 22:03:31 -0200
parents 9103dab96093
children 4787e2b0dd03
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved