Synchronise with v4.0

[kconfig-frontends] / utils / merge

diff --git a/utils/merge b/utils/merge
index 81b0c61bb9e2060c18fb9dd315e8a9e0ae8a195a..2ab91b9b100dc6f6cfba663d05580e14930a3def 100755 (executable)
--- a/utils/merge
+++ b/utils/merge
@@ -77,6 +77,11 @@ while true; do
        esac
 done
 
+if [ "$#" -lt 2 ] ; then
+       usage
+       exit
+fi
+
 INITFILE=$1
 shift;