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

r4531:b51a8138 default
r6206:0b6f1249 default
Show More
test-extra-filelog-entry.out
3 lines | 157 B | text/plain | TextLexer
/ tests / test-extra-filelog-entry.out
adding b
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 1e88685f5dde 000000000000 000000000000