Mercurial > hg
view tests/test-debugrename.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 | 5a088ac232e6 |
children | f2618cacb485 |
line wrap: on
line source
adding a b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f % test with --rev b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3