view tests/test-no-symlinks.out @ 7847:30cb79d84352

resolve: keep .orig files
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Mar 2009 16:58:41 -0500
parents 158fa833d243
children
line wrap: on
line source

% unbundle
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
d/b
% move and copy
a
d/b
% bundle
2 changesets found
pulling from ../symlinks.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 6 changes to 6 files
(run 'hg update' to get a working copy)
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
a
d/b