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

r5930:c301f15c default
r6206:0b6f1249 default
Show More
test-non-interactive-wsgi.out
12 lines | 235 B | text/plain | TextLexer
/ tests / test-non-interactive-wsgi.out
changeset: 0:61c9426e69fe
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: test
---- HEADERS
200 Script output follows
---- DATA
[('Content-Type', 'text/html; charset=ascii')]
---- ERRORS