Skip to content

Commit 142183d

Browse files
Nicolas Sebrechtgitster
authored andcommitted
checkout: accord documentation to what git does
Signed-off-by: Nicolas Sebrecht <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0e418e5 commit 142183d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-checkout.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ the above checkout would fail like this:
238238
+
239239
------------
240240
$ git checkout mytopic
241-
fatal: Entry 'frotz' not uptodate. Cannot merge.
241+
error: You have local changes to 'frotz'; not switching branches.
242242
------------
243243
+
244244
You can give the `-m` flag to the command, which would try a

0 commit comments

Comments
 (0)