Adding upstream version 1.14~rc3.upstream/1.14_rc3

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 2 insertions, 2 deletions

diff --git a/merge.cc b/merge.cc
index 7ef0455..c254a59 100644
--- a/merge.cc
+++ b/merge.cc
@@ -135,7 +135,7 @@ int open_input_files( const std::vector< std::string > & filenames,
       else if( st_ino0 == in_stats.st_ino && st_dev0 == in_stats.st_dev )
         { identical = true; break; }
       }
-  if( identical ) { show_error( "Two input files are the same." ); return 1; }
+  if( identical ) { show_error( "Two input files are the same." ); return 2; }
 
   isize = 0;
   for( unsigned i = 0; i < filenames.size(); ++i )
@@ -154,7 +154,7 @@ int open_input_files( const std::vector< std::string > & filenames,
         { show_error( "Input file is too short." ); return 2; }
       }
     else if( isize != tmp )
-      { show_error( "Sizes of input files are different." ); return 1; }
+      { show_error( "Sizes of input files are different." ); return 2; }
     }
 
   for( unsigned i = 0; i < filenames.size(); ++i )