From f76c672bfae369cb8037814b0b074a3aedfd84da Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Sat, 27 Mar 2010 00:04:10 -0700
Subject: [PATCH] More mismerging fixes.

---
 js/src/jsexn.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
index 171c1482140..c62beef5ec1 100644
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -839,9 +839,8 @@ exn_toSource(JSContext *cx, uintN argc, jsval *vp)
     *vp = STRING_TO_JSVAL(name);
 
     JSTempValueRooter tvr;
+    JSBool ok;
     {
-        JSBool ok;
-
         MUST_FLOW_THROUGH("out");
         JS_PUSH_TEMP_ROOT(cx, 3, localroots, &tvr);
 
@@ -953,7 +952,7 @@ exn_toSource(JSContext *cx, uintN argc, jsval *vp)
 
   out:
     JS_POP_TEMP_ROOT(cx, &tvr);
-    return JS_FALSE;
+    return JS_TRUE;
 }
 #endif