From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:46:34 +0000 (-0700)
Subject: Merge branch 'jx/blame-align-relative-time' into maint
X-Git-Tag: v2.0.1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bf84263b3be507352f2edc9397e4ca6660be289;p=git

Merge branch 'jx/blame-align-relative-time' into maint

"git blame" miscounted number of columns needed to show localized
timestamps, resulting in jaggy left-side-edge of the source code
lines in its output.

* jx/blame-align-relative-time:
  blame: dynamic blame_date_width for different locales
  blame: fix broken time_buf paddings in relative timestamp
---

6bf84263b3be507352f2edc9397e4ca6660be289