##// 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.
Stephen Darnell - - Load All Authors

File last commit:

r3199:096f1c73 default
r6206:0b6f1249 default
Show More
test-diff-subdir
24 lines | 291 B | text/plain | TextLexer
/ tests / test-diff-subdir
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
mkdir alpha
touch alpha/one
mkdir beta
touch beta/two
hg add alpha/one beta/two
hg ci -m "start" -d "1000000 0"
echo 1 > alpha/one
echo 2 > beta/two
echo EVERYTHING
hg diff --nodates
echo BETA ONLY
hg diff --nodates beta
echo INSIDE BETA
cd beta
hg diff --nodates .