Handle merge confligt for previous patches. The exact same bug was fixed twice.

darcs-hash:20070908222725-75c98-2e1d0b090608d71f452c6ba7c3e1281782ebec11.gz
2025-03-15 15:05:27 +08:00 · 2007-09-09 08:27:25 +10:00 · 2007-09-09 08:27:25 +10:00 · b0ae3dc9cc
commit b0ae3dc9cc
parent a900d16540
1 changed files with 3 additions and 3 deletions
--- a/builtin.c
+++ b/builtin.c
@ -2526,9 +2526,9 @@ static int builtin_source( wchar_t ** argv )
 	if( res )
 	{
 		sb_printf( sb_err,
-				   _( L"%ls: Error while reading file '%ls'\n" ),
-				   argv[0],
-				   argv[1] );
+			   _( L"%ls: Error while reading file '%ls'\n" ),
+			   argv[0],
+			   argv[1]?argv[1]:L"<stdin>" );
 	}

 	/*