Mercurial > hg
comparison tests/test-symlink-basic.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 | 5ffa962783c4 |
| children | c24f4b3f156b |
comparison
equal
deleted
inserted
replaced
| 6205:b193a6e59131 | 6206:0b6f12495276 |
|---|