]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: abf5795) | patch
l10n: fr: don't translate "merge" as a parameter
authorVasco Almeida <vascomalmeida@sapo.pt>
Tue, 15 Mar 2016 00:34:22 +0000 (23:34 -0100)
committerVasco Almeida <vascomalmeida@sapo.pt>
Fri, 25 Mar 2016 15:04:58 +0000 (14:04 -0100)
commitbb310722467d0adda499cb70429d86fbaa755dac
treef9519494b61c5a9d11c00b50ddeb01027ef07f2ctree | snapshot
parentabf579559252af1da773b5b70dbe24a84cc73de4commit | diff
l10n: fr: don't translate "merge" as a parameter

At builtin/checkout.c:1154, merge is a parameter to --conflict=<style>
(git checkout --conflict=merge).

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
po/fr.po diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.