mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-03-27 14:45:13 +08:00
Handle merge confligt for previous patches. The exact same bug was fixed twice.
darcs-hash:20070908222725-75c98-2e1d0b090608d71f452c6ba7c3e1281782ebec11.gz
This commit is contained in:
parent
a900d16540
commit
b0ae3dc9cc
@ -2526,9 +2526,9 @@ static int builtin_source( wchar_t ** argv )
|
|||||||
if( res )
|
if( res )
|
||||||
{
|
{
|
||||||
sb_printf( sb_err,
|
sb_printf( sb_err,
|
||||||
_( L"%ls: Error while reading file '%ls'\n" ),
|
_( L"%ls: Error while reading file '%ls'\n" ),
|
||||||
argv[0],
|
argv[0],
|
||||||
argv[1] );
|
argv[1]?argv[1]:L"<stdin>" );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user