diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-checkout.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |