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

r6030:d0dbae32 default
r6206:0b6f1249 default
Show More
test-revert-flags.out
6 lines | 96 B | text/plain | TextLexer
/ tests / test-revert-flags.out
% reverting to rev 0
reverting foo
M foo
diff --git a/foo b/foo
old mode 100755
new mode 100644