Merge branch 'js/am-3-merge-recursive-direct'

diff --git a/transport.c b/transport.c
index 4ba48b05960203f9c5ed3360e99382bc945ae7e4..c5772a14eeec3d5651796c8051443dd76583c05d 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -567,7 +567,7 @@ void transport_take_over(struct transport *transport,
        struct git_transport_data *data;
 
        if (!transport->smart_options)
-               die("Bug detected: Taking over transport requires non-NULL "
+               die("BUG: taking over transport requires non-NULL "
                    "smart_options field.");
 
        data = xcalloc(1, sizeof(*data));