##// 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:

r3934:d0bbd8ee default
r6206:0b6f1249 default
Show More
README
7 lines | 158 B | text/plain | TextLexer
To run the tests, do:
cd tests/
python run-tests.py
See http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests for
more information on writing tests.