Skip to content

Commit 4988f48

Browse files
authored
Update basic.rb
1 parent 3178667 commit 4988f48

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/thor/shell/basic.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def merge(destination, content) #:nodoc:
372372
Tempfile.open([File.basename(destination), File.extname(destination)], File.dirname(destination)) do |temp|
373373
temp.write content
374374
temp.rewind
375-
system %(#{merge_tool} "#{temp.path}" "#{destination}")
375+
system(merge_tool, temp.path, destination)
376376
end
377377
end
378378

0 commit comments

Comments
 (0)