Merge git://github.com/git-l10n/git-po into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:58:03 +0000 (13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Sep 2013 20:58:03 +0000 (13:58 -0700)
* git://github.com/git-l10n/git-po:
l10n: fr.po: hotfix for commit 6b388fc

templates/hooks--pre-push.sample
index 15ab6d8e7ea05ca54f0b755828e166fafe9bc28c..1f3bcebfd76ae1b37e1542631a87e5a5e3e6b1eb 100755 (executable)
@@ -30,6 +30,7 @@ do
        if [ "$local_sha" = $z40 ]
        then
                # Handle delete
+               :
        else
                if [ "$remote_sha" = $z40 ]
                then