ruby on rails code history
junit code histoty generated with script
regenerated clojure code history; misc wording fixes
extracted merge.rb
simplified merge parameters