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

diff --git a/t/lib-httpd/error.sh b/t/lib-httpd/error.sh
index 23cec97cc315c935e308d0b8794c01a06a1630db..a77b8e546926308fbe348bf01d625bad4996a095 100755 (executable)
--- a/t/lib-httpd/error.sh
+++ b/t/lib-httpd/error.sh
@@ -15,6 +15,14 @@ case "$PATH_INFO" in
        printf "text/plain; charset=utf-8"
        charset=utf-8
        ;;
+*utf16*)
+       printf "text/plain; charset=utf-16"
+       charset=utf-16
+       ;;
+*odd-spacing*)
+       printf "text/plain; foo=bar ;charset=utf-16; other=nonsense"
+       charset=utf-16
+       ;;
 esac
 printf "\n"