##// 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.out
22 lines | 316 B | text/plain | TextLexer
/ tests / test-diffdir.out
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
Remove dummy branch hack from tests
 r4180 diff -r acd8075edac9 b
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
 r536 --- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
Matt Mackall
Remove dummy branch hack from tests
 r4180 diff -r acd8075edac9 b
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
 r536 --- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
Matt Mackall
Remove dummy branch hack from tests
 r4180 diff -r acd8075edac9 a
Thomas Arendsen Hein
Fix diff against an empty file (issue124) and add a test for this.
 r1723 --- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
Matt Mackall
Remove dummy branch hack from tests
 r4180 diff -r acd8075edac9 b
Thomas Arendsen Hein
Fix diff against an empty file (issue124) and add a test for this.
 r1723 --- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
Alexis S. L. Carvalho
fix hg diff -r ''
 r3825 abort: Ambiguous identifier!
abort: Ambiguous identifier!