Merge pull request #178 from rebar/merge-lock-fix

Fix lock merging for nonexistant lock files.

src/rebar_config.erl

@@ -60,8 +60,13 @@ consult_file(File) ->
             end
     end.
 
+%% no lockfile
+merge_locks(Config, []) ->
+    Config;
+%% empty lockfile
 merge_locks(Config, [[]]) ->
     Config;
+%% lockfile with entries
 merge_locks(Config, [Locks]) ->
     {deps, ConfigDeps} = lists:keyfind(deps, 1, Config),
     %% We want the top level deps only from the lock file.