From ec9f0ea3e6ecf1237223dec8428e7bb73d339320 Mon Sep 17 00:00:00 2001 From: Markus Heidelberg Date: Fri, 19 Dec 2008 13:14:52 +0100 Subject: Documentation: sync example output with git output Don't confuse the user with old git messages. Signed-off-by: Markus Heidelberg Signed-off-by: Junio C Hamano --- Documentation/git-checkout.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'Documentation/git-checkout.txt') diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 79824f4819..9cd51514db 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 ------------ -- cgit v1.3