##// 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.
Giorgos Keramidas - - Load All Authors

File last commit:

r5867:b6d8972c default
r6206:0b6f1249 default
Show More
test-journal-exists
12 lines | 103 B | text/plain | TextLexer
/ tests / test-journal-exists
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo a > a
hg ci -Am0
touch .hg/store/journal
echo foo > a
hg ci -Am0
hg recover