merge script: --squash, --ff from unborn branch are errors

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 261dd90c381eccbd87d73325478e1d5abcf05e15..1bacd2e1044f5b3b7d5a60e1687387cc277fc52a 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -263,7 +263,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