You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://beartocode.github.io/mismerge/) and start merging now, or use it as a component for your project.
13
+
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://getjoystick.github.io/mismerge/) and start merging now, or use it as a component for your project.
14
14
15
15
## Features
16
16
@@ -27,19 +27,19 @@ Mismerge is a modern two-way and one-way merge editor for the web, built with Sv
27
27
## Installation
28
28
29
29
```
30
-
npm i @mismerge/core
30
+
npm i @getjoystick/mismerge-core
31
31
```
32
32
33
33
## Usage
34
34
35
35
```svelte
36
36
<script>
37
-
import { MisMerge3 } from '@mismerge/core';
37
+
import { MisMerge3 } from '@getjoystick/mismerge-core';
38
38
// Core styles, required for the editor to work properly
39
-
import '@mismerge/core/styles.css';
39
+
import '@getjoystick/mismerge-core/styles.css';
40
40
41
-
import '@mismerge/core/light.css';
42
-
// Or '@mismerge/core/dark.css';
41
+
import '@getjoystick/mismerge-core/light.css';
42
+
// Or '@getjoystick/mismerge-core/dark.css';
43
43
44
44
let lhs = 'foo';
45
45
let ctr = 'bar';
@@ -83,7 +83,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
83
83
84
84
```svelte
85
85
<script>
86
-
import { DefaultDarkColors } from '@mismerge/core';
86
+
import { DefaultDarkColors } from '@getjoystick/mismerge-core';
87
87
// ...
88
88
</script>
89
89
@@ -92,7 +92,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
92
92
93
93
### Styles
94
94
95
-
If you want to customize the editor styles, you can copy the default [light](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
95
+
If you want to customize the editor styles, you can copy the default [light](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
96
96
97
97
Here is a basic explanation of how the the rendered html looks like:
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://beartocode.github.io/mismerge/) and start merging now, or use it as a component for you project.
12
+
Mismerge is a modern two-way and one-way merge editor for the web, built with Svelte. You can [visit the demo](https://getjoystick.github.io/mismerge/) and start merging now, or use it as a component for you project.
13
13
14
14
## Features
15
15
@@ -26,19 +26,19 @@ Mismerge is a modern two-way and one-way merge editor for the web, built with Sv
26
26
## Installation
27
27
28
28
```
29
-
npm i @mismerge/core
29
+
npm i @getjoystick/mismerge-core
30
30
```
31
31
32
32
## Usage
33
33
34
34
```svelte
35
35
<script>
36
-
import { MisMerge3 } from '@mismerge/core';
36
+
import { MisMerge3 } from '@getjoystick/mismerge-core';
37
37
// Core styles, required for the editor to work properly
38
-
import '@mismerge/core/styles.css';
38
+
import '@getjoystick/mismerge-core/styles.css';
39
39
40
-
import '@mismerge/core/light.css';
41
-
// Or '@mismerge/core/dark.css';
40
+
import '@getjoystick/mismerge-core/light.css';
41
+
// Or '@getjoystick/mismerge-core/dark.css';
42
42
43
43
let lhs = 'foo';
44
44
let ctr = 'bar';
@@ -82,7 +82,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
82
82
83
83
```svelte
84
84
<script>
85
-
import { DefaultDarkColors } from '@mismerge/core';
85
+
import { DefaultDarkColors } from '@getjoystick/mismerge-core';
86
86
// ...
87
87
</script>
88
88
@@ -91,7 +91,7 @@ You need to provide your own syntax highlighter. Example and demo using [Shiki-J
91
91
92
92
### Styles
93
93
94
-
If you want to customize the editor styles, you can copy the default [light](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/BearToCode/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
94
+
If you want to customize the editor styles, you can copy the default [light](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/light.css) or [dark](https://github.com/getjoystick/mismerge/blob/master/packages/core/src/lib/styles/dark.css) theme and adapt it to your need.
95
95
96
96
Here is a basic explanation of how the the rendered html looks like:
0 commit comments