##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Merge with stable
Merge with stable
Matt Mackall - - Load All Authors

File last commit:

r5863:3d1f9dce default
r7856:166b6b12 merge default
Show More
test-diff-hashes.out
33 lines | 722 B | text/plain | TextLexer
/ tests / test-diff-hashes.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Move diffing missing file test and remove test-notfound...
 r5689 found: No such file or directory
not: No such file or directory
Alexis S. L. Carvalho
use short hashes with diff -v
 r3387 quiet:
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Alexis S. L. Carvalho
use short hashes with diff -v
 r3387 -bar
+foobar
normal:
diff -r 74de3f1392e2 -r b8b5f023a6ad foo
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Alexis S. L. Carvalho
use short hashes with diff -v
 r3387 -bar
+foobar
verbose:
diff -r 74de3f1392e2 -r b8b5f023a6ad foo
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Alexis S. L. Carvalho
use short hashes with diff -v
 r3387 -bar
+foobar
debug:
diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Alexis S. L. Carvalho
use short hashes with diff -v
 r3387 -bar
+foobar