Fix mismerge

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-02 22:06:43 +02:00
parent 41ca7b81a9
commit fb73efb794

View file

@ -49,10 +49,11 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
if (!command_help)
return 1;
break;
grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
&unicode_last_position);
FOR_ACTIVE_TERM_OUTPUTS(term)
{
unsigned stringwidth;