@adecore/merge 0.53.3 → 0.54.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
- import { type DiffDocument, type DiffGapRow, type DiffLineRow } from './diff-document.ts';
2
1
  import type { DiffDisplay } from './diff-display.ts';
2
+ import { type DiffDocument, type DiffGapRow, type DiffLineRow } from './diff-document.ts';
3
3
  export type DiffSplitRow = {
4
4
  readonly kind: 'line';
5
5
  readonly row: DiffLineRow;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adecore/merge",
3
- "version": "0.53.3",
3
+ "version": "0.54.0",
4
4
  "description": "Pure line diffs, three-way merge blocks and conflict resolution.",
5
5
  "license": "FSL-1.1-MIT",
6
6
  "author": "Bas Milius",
package/src/diff-split.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { diffRows, type DiffDocument, type DiffGapRow, type DiffLineRow } from './diff-document.ts';
2
1
  import type { DiffDisplay } from './diff-display.ts';
2
+ import { diffRows, type DiffDocument, type DiffGapRow, type DiffLineRow } from './diff-document.ts';
3
3
 
4
4
  export type DiffSplitRow =
5
5
  | { readonly kind: 'line'; readonly row: DiffLineRow; readonly old?: number; readonly new?: number }