From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Date: Fri, 9 Jul 2010 20:27:48 +0000 (+0200)
Subject: checkout: accord documentation to what git does
X-Git-Tag: v1.7.2-rc3~6^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/142183d09634aa00a47107c7ffc5e39fa6cbf1b0?ds=inline;hp=--cc

checkout: accord documentation to what git does

Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

142183d09634aa00a47107c7ffc5e39fa6cbf1b0
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 7146288ad6..7b83162223 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -238,7 +238,7 @@ the above checkout would fail like this:
 +
 ------------
 $ git checkout mytopic
-fatal: Entry 'frotz' not uptodate. Cannot merge.
+error: You have local changes to 'frotz'; not switching branches.
 ------------
 +
 You can give the `-m` flag to the command, which would try a