From: Junio C Hamano Date: Wed, 16 Jul 2014 18:10:30 +0000 (-0700) Subject: Merge branch 'maint-1.8.5' into maint-1.9 X-Git-Tag: v2.0.2~6^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d22acacf810a92d5634099a7db0367ce5b6fdcef Merge branch 'maint-1.8.5' into maint-1.9 * maint-1.8.5: annotate: use argv_array t7300: repair filesystem permissions with test_when_finished enums: remove trailing ',' after last item in enum --- d22acacf810a92d5634099a7db0367ce5b6fdcef