mirror of
https://github.com/middleman/middleman.git
synced 2022-11-09 12:20:27 -05:00
Say :update, not :create on automatic conflict resolution
This commit is contained in:
parent
bd9d9d0f93
commit
ddc0712c1b
1 changed files with 1 additions and 1 deletions
|
@ -268,7 +268,7 @@ class ::Thor::Actions::CreateFile
|
||||||
if identical?
|
if identical?
|
||||||
say_status :identical, :blue
|
say_status :identical, :blue
|
||||||
else
|
else
|
||||||
say_status :create, :green
|
say_status :update, :yellow
|
||||||
block.call unless pretend?
|
block.call unless pretend?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue