l10n: fr: don't translate "merge" as a parameter
[gitweb.git] / t / t4034 / java /
drwxr-xr-x   parent (dest: t/t4034; base: bb310722467d0adda499cb70429d86fbaa755dac)
-rw-r--r-- 2121 expect
-rw-r--r-- 271 post
-rw-r--r-- 253 pre