Adds _.merge() tests.
authordsc <dsc@wikimedia.org>
Fri, 13 Apr 2012 11:34:56 +0000 (04:34 -0700)
committerdsc <dsc@less.ly>
Fri, 13 Apr 2012 15:45:30 +0000 (08:45 -0700)
commita52f55dc812eff57a3f7e0068a2adff3d00f6b4a
treef83f8cc04800d648ba8c463bee5e2d9ec8897889
parentc1974fcf3333bff4d94829a282f44119b9050547
Adds _.merge() tests.

Conflicts:

lib/base/cascading-model.co
lib/base/cascading-model.co [new file with mode: 0644]
lib/util/cascade.co
lib/util/underscore/object.co
test/util/cascade-test.co
test/util/index.co
test/util/underscore/index.co [new file with mode: 0644]
test/util/underscore/underscore-object-test.co [new file with mode: 0644]