mergetools / gvimdiff3on commit l10n: fr: don't translate "merge" as a parameter (bb31072)
   1. "$MERGE_TOOLS_DIR/vimdiff"