builtin/merge.c: drop a parameter that is never used

diff --git a/po/pt_PT.po b/po/pt_PT.po
index 517ec29a4a3f6337e07ed411e7d86db160398fe9..689ad1b0fee552e64dc2b3cf3f7eb1da89fd65ac 100644 (file)
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -2312,7 +2312,7 @@ msgid "No names found, cannot describe anything."
 msgstr "Nenhum nome encontrado, não descreve nada."
 
 #: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
 #: builtin/diff.c:77