wt-status.c: set commitable bit if there is a meaningful merge.

diff --git a/Documentation/technical/api-sha1-array.txt b/Documentation/technical/api-sha1-array.txt
index 45d1c517cd862878198db6023d5fdbd35f9fbb6c..3e75497a37d696d534c16ff0270a808b57ac9180 100644 (file)
--- a/Documentation/technical/api-sha1-array.txt
+++ b/Documentation/technical/api-sha1-array.txt
@@ -1,7 +1,7 @@
 sha1-array API
 ==============
 
-The sha1-array API provides storage and manipulation of sets of SHA1
+The sha1-array API provides storage and manipulation of sets of SHA-1
 identifiers. The emphasis is on storage and processing efficiency,
 making them suitable for large lists. Note that the ordering of items is
 not preserved over some operations.
@@ -11,7 +11,7 @@ Data Structures
 
 `struct sha1_array`::
 
-       A single array of SHA1 hashes. This should be initialized by
+       A single array of SHA-1 hashes. This should be initialized by
        assignment from `SHA1_ARRAY_INIT`.  The `sha1` member contains
        the actual data. The `nr` member contains the number of items in
        the set.  The `alloc` and `sorted` members are used internally,