[PATCH 1/2] checkout: accord documentation to what git does

Signed-off-by: Nicolas Sebrecht <redacted>
---

The 07/07/10, Junio C Hamano wrote:

Nicolas Sebrecht [off-list ref] writes:

quoted

Signed-off-by: Nicolas Sebrecht <redacted>
---

The 07/07/10, Junio C Hamano wrote:

quoted

The "struct unpack_trees_error_msgs" mechanism was introduced so that we
can change the Porcelain level messages without breaking the plumbing API,
which these messages are part of.  Please see 8ccba00 (unpack-trees: allow
Porcelain to give different error messages, 2008-05-17) and fadd069
(merge-recursive: give less scary messages when merge did not start,
2009-09-07) for backstory.

Oh, thanks. I was unaware of this mechanism and didn't care about what I was
touching.

I suspect that the documentation patch talks about a nonexistent reality.
See 8ccba00 again ;-)

Doh! You said in this commit that

	"If you do not see something wrong with this output, your brain has already
	been rotten with use of git for too long a time."

but I claim the right to be rotten in much more ways. :-)

 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 261dd90..1bacd2e 100644
--- 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

-- 
1.7.2.rc2.194.g494e9.dirty