From 675ba5b7a0c7814afe29d8533fb87d5cdf1ac0be Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 28 Feb 2011 09:55:27 -0800
Subject: updating merge task

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Rakefile')

diff --git a/Rakefile b/Rakefile
index 3223182..946cabb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -46,7 +46,7 @@ namespace :merge do
     [basedir, 'test', 'psych/'] => [rubydir, 'test', 'psych/'],
   }
 
-  rsync = 'rsync -av --exclude extconf.rb --exclude lib --exclude ".*" --delete'
+  rsync = 'rsync -av --exclude extconf.rb --exclude lib --exclude ".*" --exclude "*.o" --exclude Makefile --exclude mkmf.log --delete'
 
   task :to_ruby do
     mergedirs.each do |from, to|
-- 
cgit v1.2.3