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>
Vasco Almeida committed
Mar 14, 2016 at 23:34 UTC
bb310722467d0adda499cb70429d86fbaa755dac
1 file changed
+1
-1
po/fr.po
+1
-1
@@ -4545,7 +4545,7 @@ msgstr "style"
4545
4546
#: builtin/checkout.c:1154
4547
msgid "conflict style (merge or diff3)"
4548
-msgstr "style de conflit (fusion ou diff3)"
4548
+msgstr "style de conflit (merge (fusion) ou diff3)"
4549
4550
#: builtin/checkout.c:1157
4551
msgid "do not limit pathspecs to sparse entries only"