From: Junio C Hamano Date: Wed, 16 Jun 2010 23:17:54 +0000 (-0700) Subject: Merge branch 'hg/maint-attr-fix' into maint X-Git-Tag: v1.7.2-rc0~7^2~49 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=755f0e36bcaaeb1c95726faaccb10da800803570;p=git.git Merge branch 'hg/maint-attr-fix' into maint * hg/maint-attr-fix: attr: Expand macros immediately when encountered. attr: Allow multiple changes to an attribute on the same line. attr: Fixed debug output for macro expansion. --- 755f0e36bcaaeb1c95726faaccb10da800803570