Kouhei Sutou
null+****@clear*****
Mon Jul 10 18:19:48 JST 2017
Kouhei Sutou 2017-07-10 18:19:48 +0900 (Mon, 10 Jul 2017) New Revision: a330eb9fa76abbe64b80b26257a492b6a99d6586 https://github.com/ranguba/chupa-text/commit/a330eb9fa76abbe64b80b26257a492b6a99d6586 Message: Fix inverted merge Modified files: lib/chupa-text/external-command.rb Modified: lib/chupa-text/external-command.rb (+1 -1) =================================================================== --- lib/chupa-text/external-command.rb 2017-07-10 17:25:38 +0900 (261f9a0) +++ lib/chupa-text/external-command.rb 2017-07-10 18:19:48 +0900 (9ec7887) @@ -34,7 +34,7 @@ module ChupaText pid = spawn(options[:env] || {}, @command.to_s, *arguments, - spawn_options.merge(default_spawn_options)) + default_spawn_options.merge(spawn_options)) pid, status = Process.waitpid2(pid) status.success? end -------------- next part -------------- HTML����������������������������...下载
