From b0ae3dc9ccaa3de295591c12e174c203f7118b25 Mon Sep 17 00:00:00 2001 From: liljencrantz Date: Sun, 9 Sep 2007 08:27:25 +1000 Subject: [PATCH] Handle merge confligt for previous patches. The exact same bug was fixed twice. darcs-hash:20070908222725-75c98-2e1d0b090608d71f452c6ba7c3e1281782ebec11.gz --- builtin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin.c b/builtin.c index 2dbb3be2a..0aff1d7e3 100644 --- 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"" ); } /*