##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4363:2e3c54fb default
r6206:0b6f1249 default
Show More
test-simplemerge.py.out
5 lines | 119 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
History | Annotation | Raw |Copy content |Copy permalink
....................
----------------------------------------------------------------------
Ran 20 tests in 0.000s
OK