Mercurial > hg
view tests/test-clone.out @ 6206:0b6f12495276
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 05 Mar 2008 09:10:45 -0800 |
parents | 3b96cefc1b2b |
children | 0750f11152fe |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved a checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions a not present checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions destination directory: a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved a#0