aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-02 08:36:41 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-02 08:36:41 +0000
commit868d9f5a2c194d242e8679ada77dd6281af3c134 (patch)
tree34737f1658c083d4c8f80b23fe404e71ae8e3d7d /railties/CHANGELOG
parent4bd64363c12a1b00faa52fcf4970fbfdc11c15ab (diff)
downloadrails-868d9f5a2c194d242e8679ada77dd6281af3c134.tar.gz
rails-868d9f5a2c194d242e8679ada77dd6281af3c134.tar.bz2
rails-868d9f5a2c194d242e8679ada77dd6281af3c134.zip
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
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
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]