view tests/test-bad-extension.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.

*** failed to import extension badext from .../badext.py: bit bucket overflow
*** failed to import extension badext2: No module named badext2
hg help [COMMAND]

show help for a command, extension, or list of commands