Code

Merge branch 'mg/pretty-magic-space'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:45:22 +0000 (09:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 16:45:22 +0000 (09:45 -0700)
commit223a923c37f76ee91eb6a9cb77ce6d31dcf939cc
treeb56a1133686e8a283ed13141459a73aa7056c74b
parent5bfd53629e93113a17fe7d6a7a24554dc3c17cdb
parent7b88176e9bce658fd44c2192c1b7aa6e612ee0c2
Merge branch 'mg/pretty-magic-space'

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

Conflicts:
pretty.c
pretty.c