chore(release): 5.3.6 [skip ci]

## [5.3.6](https://github.com/wickedest/Mergely/compare/v5.3.5...v5.3.6) (2024-10-11) ### Bug Fixes * **#207:** Updated documentation for search method. ([#214](https://github.com/wickedest/Mergely/issues/214)) ([350e5af](350e5af2e8)), closes [#207](https://github.com/wickedest/Mergely/issues/207)
fix(#207 ): Updated documentation for search method. (#214 )
2025-11-06 04:30:40 +08:00 · 2024-10-11 20:56:16 +00:00 · 2024-10-11 21:52:46 +01:00 · 2024-10-11 19:58:19 +00:00 · 2024-10-11 20:57:24 +01:00 · 2024-10-11 19:52:13 +00:00
10 changed files with 243 additions and 183 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+## [5.3.6](https://github.com/wickedest/Mergely/compare/v5.3.5...v5.3.6) (2024-10-11)
+
+
+### Bug Fixes
+
+* **#207:** Updated documentation for search method. ([#214](https://github.com/wickedest/Mergely/issues/214)) ([350e5af](https://github.com/wickedest/Mergely/commit/350e5af2e8b2e852364dc5a5729e03e3bc75358b)), closes [#207](https://github.com/wickedest/Mergely/issues/207)
+
+## [5.3.5](https://github.com/wickedest/Mergely/compare/v5.3.4...v5.3.5) (2024-10-11)
+
+
+### Bug Fixes
+
+* bump dependencies ([#213](https://github.com/wickedest/Mergely/issues/213)) ([83df02d](https://github.com/wickedest/Mergely/commit/83df02d967ce3100a33216f8ca77c2168bd53234))
+
+## [5.3.4](https://github.com/wickedest/Mergely/compare/v5.3.3...v5.3.4) (2024-10-11)
+
+
+### Reverts
+
+* Revert "build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203)" ([c36d2a7](https://github.com/wickedest/Mergely/commit/c36d2a7ba9ca895844126711aa00b9634814e1dc)), closes [#203](https://github.com/wickedest/Mergely/issues/203)
+
+## [5.3.3](https://github.com/wickedest/Mergely/compare/v5.3.2...v5.3.3) (2024-10-11)
+
+
+### Bug Fixes
+
+* **#209:** Fixes issue with options not being preserved when individually set. ([#211](https://github.com/wickedest/Mergely/issues/211)) ([4cd8897](https://github.com/wickedest/Mergely/commit/4cd8897c6b157d506560bb09f508f9debe2a4211))
+
+## [5.3.2](https://github.com/wickedest/Mergely/compare/v5.3.1...v5.3.2) (2024-07-31)
+
+
+### Bug Fixes
+
+* Removed debug code ([c7b0fd0](https://github.com/wickedest/Mergely/commit/c7b0fd03b01cb3267d292c2985ca8b62adda11e0))
+
+## [5.3.1](https://github.com/wickedest/Mergely/compare/v5.3.0...v5.3.1) (2024-06-19)
+
+
+### Bug Fixes
+
+* Fixed a regression rendering inline markup for numbers, punctuation, and symbols ([#199](https://github.com/wickedest/Mergely/issues/199)) ([c40672c](https://github.com/wickedest/Mergely/commit/c40672c458723bdd0d9a0062ef1457e435866765))
+
 # [5.3.0](https://github.com/wickedest/Mergely/compare/v5.2.0...v5.3.0) (2024-06-16)


--- a/README.md
+++ b/README.md
@@ -353,7 +353,7 @@ Scrolls to the next change specified by `direction`.
 doc.scrollToDiff('next');
 ```

-### <a name="search"></a>search(side: string, needle: string)
+### <a name="search"></a>search(side: string, needle: string, direction: string = 'next')

 Search the editor for `needle`, scrolling to the next available match. Repeating the call will find the next available token.

@@ -363,6 +363,7 @@ Search the editor for `needle`, scrolling to the next available match. Repeating
 |----|----|-----------|
 |side|string|The editor side, either `lhs` or `rhs`.|
 |needle|string|The text for which to search.|
+|direction|string|The direction to search, either `prev` or `next`.|

 #### Example

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "mergely",
-  "version": "5.3.0",
+  "version": "5.3.6",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "mergely",
-      "version": "5.3.0",
+      "version": "5.3.6",
      "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
      "devDependencies": {
        "@babel/core": "^7.1.6",
@@ -4117,30 +4117,10 @@
        "@types/node": "*"
      }
    },
-    "node_modules/@types/eslint": {
-      "version": "8.56.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
-      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
      "dev": true
    },
    "node_modules/@types/express": {
@@ -4579,10 +4559,10 @@
        "node": ">=0.4.0"
      }
    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
      "dev": true,
      "peerDependencies": {
        "acorn": "^8"
@@ -5008,9 +4988,9 @@
      }
    },
    "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
      "dev": true,
      "dependencies": {
        "bytes": "3.1.2",
@@ -5021,7 +5001,7 @@
        "http-errors": "2.0.0",
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
        "raw-body": "2.5.2",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
@@ -5079,12 +5059,12 @@
      }
    },
    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
      "dev": true,
      "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
      },
      "engines": {
        "node": ">=8"
@@ -6293,9 +6273,9 @@
      "dev": true
    },
    "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
      "dev": true,
      "engines": {
        "node": ">= 0.6"
@@ -7148,9 +7128,9 @@
      }
    },
    "node_modules/engine.io": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz",
-      "integrity": "sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
+      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
      "dev": true,
      "dependencies": {
        "@types/cookie": "^0.4.1",
@@ -7158,29 +7138,29 @@
        "@types/node": ">=10.0.0",
        "accepts": "~1.3.4",
        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
        "cors": "~2.8.5",
        "debug": "~4.3.1",
        "engine.io-parser": "~5.2.1",
-        "ws": "~8.11.0"
+        "ws": "~8.17.1"
      },
      "engines": {
        "node": ">=10.2.0"
      }
    },
    "node_modules/engine.io-parser": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz",
-      "integrity": "sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
      "dev": true,
      "engines": {
        "node": ">=10.0.0"
      }
    },
    "node_modules/enhanced-resolve": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz",
-      "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
      "dev": true,
      "dependencies": {
        "graceful-fs": "^4.2.4",
@@ -7631,37 +7611,37 @@
      }
    },
    "node_modules/express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.21.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
+      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
      "dev": true,
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
        "fresh": "0.5.2",
        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
        "methods": "~1.1.2",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
        "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
        "range-parser": "~1.2.1",
        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
        "setprototypeof": "1.2.0",
        "statuses": "2.0.1",
        "type-is": "~1.6.18",
@@ -7673,9 +7653,9 @@
      }
    },
    "node_modules/express/node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
      "dev": true,
      "engines": {
        "node": ">= 0.6"
@@ -7690,14 +7670,23 @@
        "ms": "2.0.0"
      }
    },
+    "node_modules/express/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/express/node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
      "dev": true,
      "dependencies": {
        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "on-finished": "2.4.1",
        "parseurl": "~1.3.3",
@@ -7834,9 +7823,9 @@
      }
    },
    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
      "dev": true,
      "dependencies": {
        "to-regex-range": "^5.0.1"
@@ -10667,10 +10656,13 @@
      }
    },
    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
    },
    "node_modules/merge-stream": {
      "version": "2.0.0",
@@ -10697,12 +10689,12 @@
      }
    },
    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
      "dev": true,
      "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
        "picomatch": "^2.3.1"
      },
      "engines": {
@@ -15080,9 +15072,9 @@
      "dev": true
    },
    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
      "dev": true
    },
    "node_modules/path-type": {
@@ -15521,12 +15513,12 @@
      }
    },
    "node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
      "dev": true,
      "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
      },
      "engines": {
        "node": ">=0.6"
@@ -16886,9 +16878,9 @@
      }
    },
    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
      "dev": true,
      "dependencies": {
        "debug": "2.6.9",
@@ -17018,20 +17010,29 @@
      "dev": true
    },
    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
      "dev": true,
      "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
        "escape-html": "~1.0.3",
        "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
      },
      "engines": {
        "node": ">= 0.8.0"
      }
    },
+    "node_modules/serve-static/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
    "node_modules/set-function-length": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -17166,16 +17167,16 @@
      }
    },
    "node_modules/socket.io": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
-      "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
+      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
      "dev": true,
      "dependencies": {
        "accepts": "~1.3.4",
        "base64id": "~2.0.0",
        "cors": "~2.8.5",
        "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
+        "engine.io": "~6.6.0",
        "socket.io-adapter": "~2.5.2",
        "socket.io-parser": "~4.2.4"
      },
@@ -17184,13 +17185,13 @@
      }
    },
    "node_modules/socket.io-adapter": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.4.tgz",
-      "integrity": "sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==",
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
      "dev": true,
      "dependencies": {
        "debug": "~4.3.4",
-        "ws": "~8.11.0"
+        "ws": "~8.17.1"
      }
    },
    "node_modules/socket.io-parser": {
@@ -18682,21 +18683,20 @@
      }
    },
    "node_modules/webpack": {
-      "version": "5.91.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-      "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
+      "version": "5.95.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
+      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
      "dev": true,
      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
        "@types/estree": "^1.0.5",
        "@webassemblyjs/ast": "^1.12.1",
        "@webassemblyjs/wasm-edit": "^1.12.1",
        "@webassemblyjs/wasm-parser": "^1.12.1",
        "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
+        "acorn-import-attributes": "^1.9.5",
        "browserslist": "^4.21.10",
        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.16.0",
+        "enhanced-resolve": "^5.17.1",
        "es-module-lexer": "^1.2.1",
        "eslint-scope": "5.1.1",
        "events": "^3.2.0",
@@ -18918,27 +18918,6 @@
        "url": "https://opencollective.com/webpack"
      }
    },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/webpack-merge": {
      "version": "4.2.2",
      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
@@ -19310,16 +19289,16 @@
      "dev": true
    },
    "node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
      "dev": true,
      "engines": {
        "node": ">=10.0.0"
      },
      "peerDependencies": {
        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
      },
      "peerDependenciesMeta": {
        "bufferutil": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mergely",
-  "version": "5.3.0",
+  "version": "5.3.6",
  "description": "A javascript UI for diff/merge",
  "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
  "author": {
--- a/src/diff-view.js
+++ b/src/diff-view.js
@@ -449,7 +449,6 @@ CodeMirrorDiffView.prototype.bind = function(container) {
 			ev.preventDefault();
 			return;
 		}
-		const ed = this.editor[side];
 		// See if the user clicked the line number of a difference:
 		let found = false;
 		for (let i = 0; i < this.changes.length; ++i) {
--- a/src/diff.js
+++ b/src/diff.js
@@ -241,11 +241,12 @@ function CodeifyText(lhs, rhs, options) {
 	this.ctxs = {};
 	this.options = options;
 	this.options.split = this.options.split || 'lines';
+	const exp = /\p{Letter}\p{Mark}*|\p{Number}\p{Mark}*|\p{Punctuation}\p{Mark}*|\p{Symbol}\p{Mark}*|\p{White_Space}/gu;

 	if (typeof lhs === 'string') {
 		if (this.options.split === 'chars') {
 			// split characters and include their diacritical marks
-			this.lhs = lhs.match(/\p{Letter}\p{Mark}*|\p{White_Space}/gu) || [];
+			this.lhs = lhs.match(exp) || [];
 			// this.lhs = [...lhs];
 		} else if (this.options.split === 'words') {
 			this.lhs = lhs.split(/\s/);
@@ -258,7 +259,7 @@ function CodeifyText(lhs, rhs, options) {
 	if (typeof rhs === 'string') {
 		if (this.options.split === 'chars') {
 			// split characters and include their diacritical marks
-			this.rhs = rhs.match(/\p{Letter}\p{Mark}*|\p{White_Space}/gu) || [];
+			this.rhs = rhs.match(exp) || [];
 			// this.rhs = [...rhs];
 		} else if (this.options.split === 'words') {
 			this.rhs = rhs.split(/\s/);
--- a/src/mergely.js
+++ b/src/mergely.js
@@ -122,13 +122,11 @@ class Mergely {
 		const colors = dom.getColors(this.el);
 		this._options = {
 			...defaultOptions,//lgpl
-			...this._initOptions,
+			...(this._options || this._initOptions),
 			...options//lgpl-separate-notice
 		};
 		this._viewOptions = {
-			...defaultOptions,
-			...this._initOptions,
-			...options,
+			...this._options,
 			_colors: colors
 		};
 	}
--- a/src/vdoc.js
+++ b/src/vdoc.js
@@ -2,7 +2,9 @@ const diff = require('./diff');

 const trace = console.log;

-const expLetters = new RegExp(/\p{Letter}\p{Mark}*|\p{White_Space}/gu);
+const expLetters = new RegExp(
+	/\p{Letter}\p{Mark}*|\p{Number}\p{Mark}*|\p{Punctuation}\p{Mark}*|\p{Symbol}\p{Mark}*|\p{White_Space}/gu
+);

 class VDoc {
 	constructor(options) {
--- a/test/markup.spec.js
+++ b/test/markup.spec.js
@@ -42,6 +42,7 @@ describe('markup', () => {

 	const LHS_CHANGE_START = '.mergely.lhs.c.CodeMirror-linebackground.start';
 	const LHS_CHANGE_END = '.mergely.lhs.c.CodeMirror-linebackground.end';
+	const LHS_CHANGE_START_AND_END = '.mergely.lhs.c.CodeMirror-linebackground.start.end';
 	const RHS_CHANGE_START = '.mergely.rhs.c.CodeMirror-linebackground.start';
 	const RHS_CHANGE_END = '.mergely.rhs.c.CodeMirror-linebackground.end';

@@ -335,7 +336,28 @@ describe('markup', () => {
 				expect(rhs_spans[0].innerText).to.equal('y');
 			}
 		},
-
+		{
+			name: 'Changes with non-letter chars',
+			lhs: '~# 00 == ! (dog) \n',
+			rhs: '~? 11 ++ ] (fox) .\n',
+			check: (editor) => {
+				expect(editor.querySelectorAll(LHS_CHANGE_START_AND_END + '.cid-0')).to.have.length(1);
+				expect(editor.querySelectorAll(LHS_INLINE_TEXT + '.cid-0')).to.have.length(6);
+				expect(editor.querySelectorAll(RHS_INLINE_TEXT + '.cid-0')).to.have.length(7);
+				const lhs_changes = editor.querySelectorAll(LHS_INLINE_TEXT + '.cid-0');
+				const rhs_changes = editor.querySelectorAll(RHS_INLINE_TEXT + '.cid-0');
+				const lhs_values = [];
+				for (const value of lhs_changes.values()) {
+					lhs_values.push(value.innerText);
+				}
+				const rhs_values = [];
+				for (const value of rhs_changes.values()) {
+					rhs_values.push(value.innerText);
+				}
+				expect(lhs_values).to.deep.equal(['#', '00', '==', '!', 'd', 'g']);
+				expect(rhs_values).to.deep.equal(['?', '11', '++', ']', 'f', 'x', '.']);
+			}
+		},
 	];

 	// to debug, add `only: true` to the test `opts` above, and run `npm run debug`
--- a/test/mergely.spec.js
+++ b/test/mergely.spec.js
@@ -62,19 +62,17 @@ describe('mergely', function () {
 				try {
 					const { children } = editor.el.children[0];
 					const items = Array.from(children).map(a => a.className);
+					expect(items[0] == 'mergely-margin');
+					expect(items[1] == 'mergely-column');
 					// NOTE: if running karma debug, these tests can fail because
 					// the debugger grabs the focus and the CodeMirror instance
 					// loses `CodeMirror-focused`
-					expect(items).to.deep.equal([
-						'mergely-margin',
-						'mergely-column',
-						'CodeMirror cm-s-default CodeMirror-focused',
-						'mergely-canvas',
-						'mergely-column',
-						'CodeMirror cm-s-default',
-						'mergely-margin',
-						'mergely-splash'
-					]);
+					expect(items[2].indexOf('CodeMirror cm-s-default' == 0));
+					expect(items[3] == 'mergely-margin');
+					expect(items[4] == 'mergely-column');
+					expect(items[5] == 'CodeMirror cm-s-default');
+					expect(items[6] == 'mergely-column');
+					expect(items[7] == 'mergely-splash');
 					expect(editor.get('lhs')).to.equal('');
 					expect(editor.get('rhs')).to.equal('');
 					done();
@@ -99,15 +97,17 @@ describe('mergely', function () {
 					// NOTE: if running karma debug, these tests can fail because
 					// the debugger grabs the focus and the CodeMirror instance
 					// loses `CodeMirror-focused`
-					expect(items).to.deep.equal([
-						'mergely-margin',
-						'mergely-column',
-						'CodeMirror cm-s-default CodeMirror-focused',
-						'mergely-canvas',
-						'mergely-column',
-						'CodeMirror cm-s-default',
-						'mergely-margin'
-					]);
+					expect(items[0] == 'mergely-margin');
+					expect(items[1] == 'mergely-column');
+					// NOTE: if running karma debug, these tests can fail because
+					// the debugger grabs the focus and the CodeMirror instance
+					// loses `CodeMirror-focused`
+					expect(items[2].indexOf('CodeMirror cm-s-default' == 0));
+					expect(items[3] == 'mergely-margin');
+					expect(items[4] == 'mergely-column');
+					expect(items[5] == 'CodeMirror cm-s-default');
+					expect(items[6] == 'mergely-column');
+					expect(items[7] == 'mergely-splash');
 					expect(editor.get('lhs')).to.equal('left-hand side text');
 					expect(editor.get('rhs')).to.equal('right-hand side text');
 					done();
@@ -129,18 +129,17 @@ describe('mergely', function () {
 				try {
 					const { children } = editor.el.children[0];
 					const items = Array.from(children).map(a => a.className);
+					expect(items[0] == 'mergely-margin');
+					expect(items[1] == 'mergely-column');
 					// NOTE: if running karma debug, these tests can fail because
 					// the debugger grabs the focus and the CodeMirror instance
 					// loses `CodeMirror-focused`
-					expect(items).to.deep.equal([
-						'mergely-margin',
-						'mergely-column',
-						'CodeMirror cm-s-default CodeMirror-focused',
-						'mergely-canvas',
-						'mergely-column',
-						'CodeMirror cm-s-default',
-						'mergely-margin'
-					]);
+					expect(items[2].indexOf('CodeMirror cm-s-default' == 0));
+					expect(items[3] == 'mergely-margin');
+					expect(items[4] == 'mergely-column');
+					expect(items[5] == 'CodeMirror cm-s-default');
+					expect(items[6] == 'mergely-column');
+					expect(items[7] == 'mergely-splash');
 					expect(editor.get('lhs')).to.equal('left-hand side text');
 					expect(editor.get('rhs')).to.equal('right-hand side text');
 					done();
@@ -161,18 +160,17 @@ describe('mergely', function () {
 				try {
 					const { children } = editor.el.children[0];
 					const items = Array.from(children).map(a => a.className);
+					expect(items[0] == 'mergely-margin');
+					expect(items[1] == 'mergely-column');
 					// NOTE: if running karma debug, these tests can fail because
 					// the debugger grabs the focus and the CodeMirror instance
 					// loses `CodeMirror-focused`
-					expect(items).to.deep.equal([
-						'mergely-margin',
-						'mergely-column',
-						'CodeMirror cm-s-default CodeMirror-focused',
-						'mergely-canvas',
-						'mergely-column',
-						'CodeMirror cm-s-default',
-						'mergely-margin'
-					]);
+					expect(items[2].indexOf('CodeMirror cm-s-default' == 0));
+					expect(items[3] == 'mergely-margin');
+					expect(items[4] == 'mergely-column');
+					expect(items[5] == 'CodeMirror cm-s-default');
+					expect(items[6] == 'mergely-column');
+					expect(items[7] == 'mergely-splash');
 					expect(children[0].style.visibility).to.equal('hidden');
 					expect(children[6].style.visibility).to.equal('hidden');
 					done();
@@ -503,6 +501,24 @@ describe('mergely', function () {
 			});
 		});

+		it('should preserve changed option', function (done) {
+			const editor = init({
+				change_timeout: 0,
+				license: 'lgpl-separate-notice',
+				lhs: 'left-hand side text',
+				rhs: 'right-hand side text'
+			});
+			editor.once('updated', () => {
+				editor.options({ sidebar: false });
+				expect(editor.options().wrap_lines).to.equal(false, 'wrap_lines');
+				expect(editor.options().sidebar).to.equal(false, 'sidebar');
+				editor.options({ wrap_lines: false });
+				expect(editor.options().wrap_lines).to.equal(false, 'wrap_lines-2');
+				expect(editor.options().sidebar).to.equal(false, 'sidebar-2');
+				done();
+			});
+		});
+
 		it('should ignore white-space', function (done) {
 			const editor = init({
 				height: 100,
Author	SHA1	Message	Date
semantic-release-bot	da71745c38	chore(release): 5.3.6 [skip ci] ## [5.3.6](https://github.com/wickedest/Mergely/compare/v5.3.5...v5.3.6) (2024-10-11) ### Bug Fixes * #207: Updated documentation for search method. ([#214](https://github.com/wickedest/Mergely/issues/214)) ([`350e5af`](`350e5af2e8`)), closes [#207](https://github.com/wickedest/Mergely/issues/207)	2024-10-11 20:56:16 +00:00
Jamie Peabody	350e5af2e8	fix(#207 ): Updated documentation for search method. (#214 ) * fix: bump dependencies * fix: Updated documentation for search method	2024-10-11 21:52:46 +01:00
semantic-release-bot	498746a831	chore(release): 5.3.5 [skip ci] ## [5.3.5](https://github.com/wickedest/Mergely/compare/v5.3.4...v5.3.5) (2024-10-11) ### Bug Fixes * bump dependencies ([#213](https://github.com/wickedest/Mergely/issues/213)) ([`83df02d`](`83df02d967`))	2024-10-11 19:58:19 +00:00
Jamie Peabody	83df02d967	fix: bump dependencies (#213 )	2024-10-11 20:57:24 +01:00
semantic-release-bot	51799f7dc1	chore(release): 5.3.4 [skip ci] ## [5.3.4](https://github.com/wickedest/Mergely/compare/v5.3.3...v5.3.4) (2024-10-11) ### Reverts * Revert "build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203)" ([`c36d2a7`](`c36d2a7ba9`)), closes [#203](https://github.com/wickedest/Mergely/issues/203)	2024-10-11 19:52:13 +00:00
Jamie Peabody	c36d2a7ba9	Revert "build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203 )" This reverts commit `86593de7d0`.	2024-10-11 20:51:13 +01:00
semantic-release-bot	b79ac30d4e	chore(release): 5.3.3 [skip ci] ## [5.3.3](https://github.com/wickedest/Mergely/compare/v5.3.2...v5.3.3) (2024-10-11) ### Bug Fixes * #209: Fixes issue with options not being preserved when individually set. ([#211](https://github.com/wickedest/Mergely/issues/211)) ([`4cd8897`](`4cd8897c6b`))	2024-10-11 19:49:03 +00:00
Jamie Peabody	4cd8897c6b	fix(#209 ): Fixes issue with options not being preserved when individually set. (#211 )	2024-10-11 20:47:58 +01:00
dependabot[bot]	86593de7d0	build(deps-dev): bump webpack from 5.91.0 to 5.94.0 (#203 ) Bumps [webpack](https://github.com/webpack/webpack) from 5.91.0 to 5.94.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.91.0...v5.94.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-10-11 20:42:06 +01:00
semantic-release-bot	78f68bf904	chore(release): 5.3.2 [skip ci] ## [5.3.2](https://github.com/wickedest/Mergely/compare/v5.3.1...v5.3.2) (2024-07-31) ### Bug Fixes * Removed debug code ([`c7b0fd0`](`c7b0fd03b0`))	2024-07-31 18:45:48 +00:00
Jamie Peabody	c7b0fd03b0	fix: Removed debug code	2024-07-31 19:44:47 +01:00
dependabot[bot]	8d56792b37	build(deps-dev): bump braces from 3.0.2 to 3.0.3 (#198 ) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-19 19:24:23 +01:00
dependabot[bot]	8c1c95284e	build(deps): bump ws, engine.io and socket.io-adapter (#200 ) Bumps [ws](https://github.com/websockets/ws), [engine.io](https://github.com/socketio/engine.io) and [socket.io-adapter](https://github.com/socketio/socket.io-adapter). These dependencies needed to be updated together. Updates `ws` from 8.17.0 to 8.17.1 - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/8.17.0...8.17.1) Updates `engine.io` from 6.5.4 to 6.5.5 - [Release notes](https://github.com/socketio/engine.io/releases) - [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/engine.io/compare/6.5.4...6.5.5) Updates `socket.io-adapter` from 2.5.4 to 2.5.5 - [Release notes](https://github.com/socketio/socket.io-adapter/releases) - [Changelog](https://github.com/socketio/socket.io-adapter/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-adapter/compare/2.5.4...2.5.5) --- updated-dependencies: - dependency-name: ws dependency-type: indirect - dependency-name: engine.io dependency-type: indirect - dependency-name: socket.io-adapter dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-19 19:21:48 +01:00
semantic-release-bot	0bdbfe1078	chore(release): 5.3.1 [skip ci] ## [5.3.1](https://github.com/wickedest/Mergely/compare/v5.3.0...v5.3.1) (2024-06-19) ### Bug Fixes * Fixed a regression rendering inline markup for numbers, punctuation, and symbols ([#199](https://github.com/wickedest/Mergely/issues/199)) ([`c40672c`](`c40672c458`))	2024-06-19 18:19:06 +00:00
Jamie Peabody	c40672c458	fix: Fixed a regression rendering inline markup for numbers, punctuation, and symbols (#199 )	2024-06-19 19:18:05 +01:00