From c1a7b70849f580382511d4b402be8872389abb75 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Wed, 3 Sep 2014 10:58:43 -0700
Subject: [PATCH] Missed committing part of previous fix.

---
 app/models/CocoModel.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/CocoModel.coffee b/app/models/CocoModel.coffee
index 8091035d8..ff601bcb5 100644
--- a/app/models/CocoModel.coffee
+++ b/app/models/CocoModel.coffee
@@ -64,7 +64,7 @@ class CocoModel extends Backbone.Model
   set: (attributes, options) ->
     delete @attributesWithDefaults
     inFlux = @loading or not @loaded
-    @markToRevert() unless inFlux or @_revertAttributes or @project or options?.silent
+    @markToRevert() unless inFlux or @_revertAttributes or @project or options?.fromMerge
     res = super attributes, options
     @saveBackup() if @saveBackups and (not inFlux) and @hasLocalChanges()
     res