diff options
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/merger.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 025a559408..5f48f2eeca 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -196,10 +196,11 @@ class << Merger def diff(file = nil) if svn_mode? - `svn diff --diff-cmd=diff -x -upw #{file&.shellescape}` + command = %w[svn diff --diff-cmd=diff -x -upw] else - `git diff --color #{file&.shellescape}` + command = %w[git diff --color] end + IO.popen(command + [file], &:read) end def commit(file) |