Commit e43ca2a

author

James Halliday

committed

fix conflict

2 parents 4a3ac9c + 7f5f443 commit e43ca2aCopy full SHA for e43ca2a

File tree

-0

lines changed

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,10 @@ test('repeated non-cyclic value', function(t) {`
`33`	`33`	`var two = { a: one, b: one };`
`34`	`34`	`t.equal(stringify(two), '{"a":{"x":1},"b":{"x":1}}');`
`35`	`35`	`});`
	`36`	`+`
	`37`	`+test('acyclic but with reused obj-property pointers', function (t) {`
	`38`	`+ t.plan(1);`
	`39`	`+ var x = { a: 1 }`
	`40`	`+ var y = { b: x, c: x }`
	`41`	`+ t.equal(stringify(y), '{"b":{"a":1},"c":{"a":1}}');`
	`42`	`+});`

Comments

(0)