| commit | dd5a896735352fc53a5671070df83b60c9849af4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Jun 2010 16:32:23 +0000 (18 09:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Jun 2010 16:32:23 +0000 (18 09:32 -0700) | ||
| tree | 281bda6a13c603ddf1319713003c7c49ded487e1 | treesnapshot (tar.gz zip) |
| parent | 44299d4712d289478f7a757d73ac6ec47849d215 | commitdiff |
| parent | 7b88176e9bce658fd44c2192c1b7aa6e612ee0c2 | commitdiff |
Merge branch 'mg/pretty-magic-space' into next
* mg/pretty-magic-space:
pretty: Introduce ' ' modifier to add space if non-empty
Conflicts:
pretty.c
* mg/pretty-magic-space:
pretty: Introduce ' ' modifier to add space if non-empty
Conflicts:
pretty.c
| pretty.c | diff1 | diff2 | blobhistory |