1
0
mirror of synced 2025-12-07 14:24:32 +08:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Jamie Peabody
f3e90b7588 chore(release): 4.3.9 2022-01-19 21:49:12 +00:00
Jamie Peabody
650daaff63 fix(#161): Fixed issue with options.ignorews (#162) 2022-01-19 21:46:43 +00:00
5 changed files with 12 additions and 3 deletions

View File

@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### 4.3.9 (2022-01-19)
### Bug Fixes
* **#161:** Fixed issue with `options.ignorews` ([#162](https://github.com/wickedest/Mergely/issues/162)) ([650daaf](https://github.com/wickedest/Mergely/commit/650daaff63503f6426f64b12d8b33cfca6ef7185))
### 4.3.8 (2021-11-21)

View File

@@ -8,4 +8,4 @@ npm run test
## Conventional commits
Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0).
Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0), and [standard-version](https://www.npmjs.com/package/standard-version).

View File

@@ -4,6 +4,8 @@
"build",
"chore",
"ci",
"feat",
"fix",
"docs",
"style",
"refactor",

View File

@@ -1,6 +1,6 @@
{
"name": "mergely",
"version": "4.3.8",
"version": "4.3.9",
"description": "A javascript UI for diff/merge",
"directories": {
"doc": "doc",

View File

@@ -3,7 +3,7 @@ const DiffParser = require('./diff-parser');
function LCS(x, y, options) {
function getPositionOfWords(text, options) {
var exp = new RegExp(/\w+/g);
var exp = new RegExp(/[^\s]/g);
var map = {};
var match;
var item = 0;