summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorMarkus Heidelberg <markus.heidelberg@web.de>2008-12-19 12:14:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-19 19:55:33 (GMT)
commitec9f0ea3e6ecf1237223dec8428e7bb73d339320 (patch)
tree327def1d666d8bc1e7e4cd68df344d63f230e050 /Documentation/git-checkout.txt
parent0956a6db7ae3a93c7bce62c1e3a6e0795055ad9f (diff)
downloadgit-ec9f0ea3e6ecf1237223dec8428e7bb73d339320.zip
git-ec9f0ea3e6ecf1237223dec8428e7bb73d339320.tar.gz
git-ec9f0ea3e6ecf1237223dec8428e7bb73d339320.tar.bz2
Documentation: sync example output with git output
Don't confuse the user with old git messages. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 79824f4..9cd5151 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -232,7 +232,6 @@ the `-m` option, you would see something like this:
------------
$ git checkout -m mytopic
Auto-merging frotz
-merge: warning: conflicts during merge
ERROR: Merge conflict in frotz
fatal: merge program failed
------------