From d7746a54cc546fd03e25decbfa0ed6455a5a0436 2014-04-16 13:48:38
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: 2014-04-16 13:48:38
Subject: [PATCH] Backport PR #5613: Fixing bug #5607

Changed the method from extends to merge which merges the two arrays as
desired - With Freyert

Testing: Manually verified the fix.

---

diff --git a/IPython/html/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js
index 08b01d5..76c4ae4 100644
--- a/IPython/html/static/notebook/js/quickhelp.js
+++ b/IPython/html/static/notebook/js/quickhelp.js
@@ -135,7 +135,7 @@ var IPython = (function (IPython) {
 
     QuickHelp.prototype.build_edit_help = function (cm_shortcuts) {
         var edit_shortcuts = IPython.keyboard_manager.edit_shortcuts.help();
-        jQuery.extend(cm_shortcuts, edit_shortcuts);
+        jQuery.merge(cm_shortcuts, edit_shortcuts);
         return build_div('<h4>Edit Mode (press <code>Enter</code> to enable)</h4>', cm_shortcuts);
     };