]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1f0df7 625efa9)
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 22:18:41 +0000 (15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Apr 2016 22:18:41 +0000 (15:18 -0700)
* maint:
  l10n: fr: don't translate "merge" as a parameter
  l10n: fr: change "id de clé" to match "id-clé"
  l10n: fr: fix wrongly translated option name
  l10n: fr: fix transcation of "dir"


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.