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>
git-mirror · Jul 9, 2010 · 142183d · 142183d
1 parent 0e418e5
commit 142183d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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