mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00:00
Merge branch 'maint'
* maint:
fix shell syntax error in template
l10n: fr.po: hotfix for commit 6b388fc
This commit is contained in:
commit
0a41de8f81
3 changed files with 875 additions and 718 deletions
1
po/TEAMS
1
po/TEAMS
|
@ -15,6 +15,7 @@ Members: Thomas Rast <trast@student.ethz.ch>
|
|||
Language: fr (French)
|
||||
Repository: https://github.com/jnavila/git
|
||||
Leader: Jean-Noël Avila <jn.avila@free.fr>
|
||||
Members: Sébastien Helleu <flashcode@flashtux.org>
|
||||
|
||||
Language: is (Icelandic)
|
||||
Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
|
||||
|
|
|
@ -30,6 +30,7 @@ do
|
|||
if [ "$local_sha" = $z40 ]
|
||||
then
|
||||
# Handle delete
|
||||
:
|
||||
else
|
||||
if [ "$remote_sha" = $z40 ]
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue