Merge branch 'maint-1.8.2' into maint-1.8.3

* maint-1.8.2:
  fix shell syntax error in template
This commit is contained in:
Junio C Hamano 2013-09-03 13:54:26 -07:00
commit e5be297279

View File

@ -30,6 +30,7 @@ do
if [ "$local_sha" = $z40 ] if [ "$local_sha" = $z40 ]
then then
# Handle delete # Handle delete
:
else else
if [ "$remote_sha" = $z40 ] if [ "$remote_sha" = $z40 ]
then then