Nil cannot and should not convert to a string
This commit is contained in:
parent
5c87bb3b90
commit
7d02bab0b0
@ -200,7 +200,7 @@ class << Merger
|
|||||||
else
|
else
|
||||||
command = %w[git diff --color]
|
command = %w[git diff --color]
|
||||||
end
|
end
|
||||||
IO.popen(command + [file], &:read)
|
IO.popen(command + [file].compact, &:read)
|
||||||
end
|
end
|
||||||
|
|
||||||
def commit(file)
|
def commit(file)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user