Merge branch 'sg/test-rebase-editor-fix' into maint

diff --git a/date.c b/date.c
index c3e673fd04221bb444e357ac01a1fe5984375daf..49f943e25b5dc4f288963077f5eabaf24f651aab 100644 (file)
--- a/date.c
+++ b/date.c
@@ -185,7 +185,7 @@ struct date_mode *date_mode_from_type(enum date_mode_type type)
 {
        static struct date_mode mode;
        if (type == DATE_STRFTIME)
-               die("BUG: cannot create anonymous strftime date_mode struct");
+               BUG("cannot create anonymous strftime date_mode struct");
        mode.type = type;
        mode.local = 0;
        return &mode;