Mercurial > hg

comparison tests/test-merge4.out @ 6206:0b6f12495276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b2ae81a7df29
children 4b0c9c674707
comparison
equal deleted inserted replaced
6205:b193a6e59131 6206:0b6f12495276