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 786f2816bb66b6dc21c593f861365924d0d1ecf1..a77b8e546926308fbe348bf01d625bad4996a095 100755 (executable)
--- a/t/lib-httpd/error.sh
+++ b/t/lib-httpd/error.sh
@@ -3,6 +3,7 @@
 printf "Status: 500 Intentional Breakage\n"
 
 printf "Content-Type: "
+charset=iso-8859-1
 case "$PATH_INFO" in
 *html*)
        printf "text/html"
@@ -10,8 +11,21 @@ case "$PATH_INFO" in
 *text*)
        printf "text/plain"
        ;;
+*charset*)
+       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"
 
 printf "\n"
-printf "this is the error message\n"
+printf "this is the error message\n" |
+iconv -f us-ascii -t $charset