tree f9519494b61c5a9d11c00b50ddeb01027ef07f2c
parent abf579559252af1da773b5b70dbe24a84cc73de4
author Vasco Almeida <vascomalmeida@sapo.pt> 1458002062 -0100
committer Vasco Almeida <vascomalmeida@sapo.pt> 1458918298 -0100

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>