From: Junio C Hamano Date: Sun, 9 May 2010 05:37:05 +0000 (-0700) Subject: Merge branch 'hg/maint-attr-fix' X-Git-Tag: v1.7.2-rc0~149 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b7d0da858bb2f22c6ef3dbb20c1ded0302f4eaca;p=git.git Merge branch 'hg/maint-attr-fix' * 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. --- b7d0da858bb2f22c6ef3dbb20c1ded0302f4eaca