#
#
# patch "commands.cc"
#  from [4fd1191a6a0eb9ad075a79a8a987b3eb38acdbfa]
#    to [8c9ad0869b0b16a452632b9e3ae127b3e2517263]
#
============================================================
--- commands.cc	4fd1191a6a0eb9ad075a79a8a987b3eb38acdbfa
+++ commands.cc	8c9ad0869b0b16a452632b9e3ae127b3e2517263
@@ -437,8 +437,13 @@ namespace commands
     else
       {
         I(matches.size() > 1);
-        N(false,
-          F("'%s' is ambiguous") % join_words(id)());
+        string err =
+          (F("'%s' is ambiguous; possible completions are:") %
+             join_words(id)()).str();
+        for (set< command_id >::const_iterator iter = matches.begin();
+             iter != matches.end(); iter++)
+          err += '\n' + join_words(*iter)();
+        N(false, i18n_format(err));
       }
 
     I(!id.empty());