From 868d9f5a2c194d242e8679ada77dd6281af3c134 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 2 Nov 2006 08:36:41 +0000
Subject: Generator can show diff on file collision to help you decide whether
 to skip or overwrite. Closes #6364.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5397 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'railties/CHANGELOG')

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 8cb4c01cfd..912d1947a7 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Generator can show diff on file collision to help you decide whether to skip or overwrite.  #6364 [jeffw, Jeremy Kemper]
+
 * Generated directories are recursively svn added, like mkdir -p.  #6416 [NeilW]
 
 * resource and scaffold_resource generators add a restful route to config/routes.rb  [Jeremy Kemper]
-- 
cgit v1.2.3