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

r3749:f9567a7f default
r6206:0b6f1249 default
Show More
test-issue436
7 lines | 59 B | text/plain | TextLexer
#!/bin/sh
hg init a
cd a
hg -v log -v
hg -v log -v x
true