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

diff --git a/po/da.po b/po/da.po
index 20a88ea529d3bc86eb1f7f7de9d05a113095dab4..898b18d1155d549f82a786c8b63ee9f9cd758c3a 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1674,7 +1674,7 @@ msgid "No names found, cannot describe anything."
 msgstr ""
 
 #: builtin/describe.c:482
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
 #: builtin/diff.c:77