cherry-pick/revert: add scissors line on merge conflict

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index f467119082243fa2f3c3187d8233f8d638f2bcb4..e0eae642c10f75cff57c0a9d07420e3218235423 100644 (file)
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -148,9 +148,9 @@ dangling <type> <object>::
        The <type> object <object>, is present in the database but never
        'directly' used. A dangling commit could be a root node.
 
-sha1 mismatch <object>::
-       The database has an object who's sha1 doesn't match the
-       database value.
+hash mismatch <object>::
+       The database has an object whose hash doesn't match the
+       object database value.
        This indicates a serious data integrity problem.
 
 Environment Variables