##// END OF EJS Templates
test-merge5: removed unnecessary parts of test...
test-merge5: removed unnecessary parts of test - no need to initialize a new directory - no need to fix the commit time, already done by run-tests - no need to exit 0, use exit code from hg instead - better spacing around comments

File last commit:

r11921:650d8a02 default
r12155:94ad12aa default
Show More
test-diffdir.t
40 lines | 638 B | text/troff | Tads3Lexer
$ hg init
$ touch a
$ hg add a
$ hg ci -m "a" -d "1000000 0"
$ echo 123 > b
$ hg add b
$ hg diff --nodates
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
$ hg diff --nodates -r tip
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
$ echo foo > a
$ hg diff --nodates
diff -r acd8075edac9 a
--- a/a
+++ b/a
@@ -0,0 +1,1 @@
+foo
diff -r acd8075edac9 b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
$ hg diff -r ""
abort: 00changelog.i@: ambiguous identifier!
$ hg diff -r tip -r ""
abort: 00changelog.i@: ambiguous identifier!
$ true