Mercurial > hg

view tests/test-mq-symlinks.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 f6c520fd70cf
children 49f34b43cf90
line wrap: on
line source

a -> a not a symlink
a -> b
Now at: base.patch
applying symlink.patch
Now at: symlink.patch
a -> b