From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jun 2010 16:45:22 +0000 (-0700)
Subject: Merge branch 'mg/pretty-magic-space'
X-Git-Tag: v1.7.2-rc0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/223a923c37f76ee91eb6a9cb77ce6d31dcf939cc?hp=223a923c37f76ee91eb6a9cb77ce6d31dcf939cc

Merge branch 'mg/pretty-magic-space'

* mg/pretty-magic-space:
pretty: Introduce ' ' modifier to add space if non-empty

Conflicts:
pretty.c
---