# HG changeset patch
# User mpm@selenic.com
# Date 1124085616 28800
# Node ID 891b6a262c4bd0ddc770d965ff5c94602c758b7e
# Parent  fcd34a9577e8a8e073433fec3ef1cc207ddeaa70# Parent  e2e7a2462eded5a5f03ec21e5418628fe99d6209
Merge with TAH



diff --git a/doc/hg.1.txt b/doc/hg.1.txt
diff --git a/mercurial/commands.py b/mercurial/commands.py
diff --git a/tests/test-help.out b/tests/test-help.out
diff --git a/tests/test-notfound b/tests/test-notfound
new file mode 100755
--- /dev/null
+++ b/tests/test-notfound
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+hg init
+
+echo "Is there an error message when trying to diff non-existing files?"
+hg diff not found
+
+echo "Is there an error message when trying to add non-existing files?"
+hg add not found
diff --git a/tests/test-notfound.out b/tests/test-notfound.out
new file mode 100644
--- /dev/null
+++ b/tests/test-notfound.out
@@ -0,0 +1,9 @@
++ hg init
+Is there an error message when trying to diff non-existing files?
++ hg diff not found
+not: No such file or directory
+found: No such file or directory
+Is there an error message when trying to add non-existing files?
++ hg add not found
+not: No such file or directory
+found: No such file or directory