From ddc0712c1b30ee58219bbaaa9bc8c622cfe244c9 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 19 Jun 2012 19:40:57 -0700 Subject: [PATCH] Say :update, not :create on automatic conflict resolution --- middleman-core/lib/middleman-core/cli/build.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb index 5be90c42..4b9e60b5 100644 --- a/middleman-core/lib/middleman-core/cli/build.rb +++ b/middleman-core/lib/middleman-core/cli/build.rb @@ -268,7 +268,7 @@ class ::Thor::Actions::CreateFile if identical? say_status :identical, :blue else - say_status :create, :green + say_status :update, :yellow block.call unless pretend? end end