##// 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.
Matt Mackall - - Load All Authors

File last commit:

r4180:f80cf8b7 default
r6206:0b6f1249 default
Show More
test-diffdir
20 lines | 205 B | text/plain | TextLexer
/ tests / test-diffdir
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
touch a
hg add a
hg ci -m "a" -d "1000000 0"
echo 123 > b
hg add b
hg diff --nodates
hg diff --nodates -r tip
echo foo > a
hg diff --nodates
hg diff -r ""
hg diff -r tip -r ""
true