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

r6061:de087885 default
r6206:0b6f1249 default
Show More
test-keyword.hg
0 lines | 302 B | application/octet-stream | TextLexer
/ tests / test-keyword.hg
Binary file (application/octet-stream)