Merge branch 'maint-1.6.0' into maint

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 79824f4819863577fbc1a313e82c739d59ea3a0e..9cd51514dbfd987db4423e254e8bab7284352525 100644 (file)
--- 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
 ------------