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>
15 years ago · 142183d096
1 changed files with 1 additions and 1 deletions
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@ -238,7 +238,7 @@ the above checkout would fail like this:
				@@ -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