##// END OF EJS Templates
fetch: switch the default parent used for a merge...
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.

File last commit:

r5157:f6c520fd default
r6206:0b6f1249 default
Show More
test-mq-symlinks.out
6 lines | 99 B | text/plain | TextLexer
/ tests / test-mq-symlinks.out
a -> a not a symlink
a -> b
Now at: base.patch
applying symlink.patch
Now at: symlink.patch
a -> b