l10n: fr: don't translate "merge" as a parameter
[gitweb.git] / t / diff-lib /
drwxr-xr-x   parent (dest: t; base: bb310722467d0adda499cb70429d86fbaa755dac)
-rw-r--r-- 18787 COPYING
-rw-r--r-- 2163 README