Merge branch 'va/i18n'

diff --git a/builtin/blame.c b/builtin/blame.c
index ab66cde2c2cf0f535678469cdf6eb6e37cd3113b..2e7b3030c67a4e83f902166533998461df444aa3 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2633,6 +2633,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
        case DATE_RAW:
                blame_date_width = sizeof("1161298804 -0700");
                break;
+       case DATE_UNIX:
+               blame_date_width = sizeof("1161298804");
+               break;
        case DATE_SHORT:
                blame_date_width = sizeof("2006-10-19");
                break;