From f86d3a69d2409992db3119dc4219833e82034c32 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 6 Dec 2017 22:39:20 +0000
Subject: [PATCH] Fix merge-abort button

---
 editor/js/ui/tab-versionControl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editor/js/ui/tab-versionControl.js b/editor/js/ui/tab-versionControl.js
index d935a14d7..eefb7e2ba 100644
--- a/editor/js/ui/tab-versionControl.js
+++ b/editor/js/ui/tab-versionControl.js
@@ -294,7 +294,7 @@ RED.sidebar.versionControl = (function() {
             .click(function(evt) {
                 evt.preventDefault();
                 evt.stopPropagation();
-                var spinner =u(unmergedContent);
+                var spinner = utils.addSpinnerOverlay(unmergedContent);
                 var activeProject = RED.projects.getActiveProject();
                 utils.sendRequest({
                     url: "projects/"+activeProject.name+"/merge",