Skip to content

Commit 86b75ba

Browse files
committed
upgrade deps && docs [skip ci]
1 parent ea7c493 commit 86b75ba

15 files changed

+114
-114
lines changed

docs/cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ nav_order: 2
1212

1313
> **findGitRoot**(): `string`
1414
15-
Defined in: [cli.ts:15](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/cli.ts#L15)
15+
Defined in: [cli.ts:15](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/cli.ts#L15)
1616

1717
Find Git root directory
1818

@@ -26,7 +26,7 @@ Find Git root directory
2626

2727
> **initConfig**(`targetDir`: `string`): `void`
2828
29-
Defined in: [cli.ts:45](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/cli.ts#L45)
29+
Defined in: [cli.ts:45](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/cli.ts#L45)
3030

3131
Write a starter config file
3232

@@ -46,7 +46,7 @@ Write a starter config file
4646

4747
> **loadConfigFile**(): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`Partial`](https://www.typescriptlang.org/docs/handbook/utility-types.html#partialtype)\<[`Config`](types/README.md#config)\<[`InbuiltMergeStrategies`](types/README.md#inbuiltmergestrategies), `unknown`\>\>\>
4848
49-
Defined in: [cli.ts:26](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/cli.ts#L26)
49+
Defined in: [cli.ts:26](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/cli.ts#L26)
5050

5151
Load configuration file (js/ts) from current dir or Git root.
5252

@@ -60,7 +60,7 @@ Load configuration file (js/ts) from current dir or Git root.
6060

6161
> **parseArgs**(`argv`: `string`[]): \{ `init?`: `boolean`; `overrides`: [`Partial`](https://www.typescriptlang.org/docs/handbook/utility-types.html#partialtype)\<[`Config`](types/README.md#config)\>; \}
6262
63-
Defined in: [cli.ts:66](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/cli.ts#L66)
63+
Defined in: [cli.ts:66](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/cli.ts#L66)
6464

6565
CLI argument parser (minimal, no external deps).
6666

docs/conflict-helper.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ nav_order: 4
1212

1313
> **reconstructConflict**(`merged`: `any`, `ours`: `any`, `theirs`: `any`, `format`: `string`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`string`\>
1414
15-
Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/conflict-helper.ts#L31)
15+
Defined in: [conflict-helper.ts:31](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/conflict-helper.ts#L31)
1616

1717
Build conflict markers into serialized string
1818

docs/file-parser.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ nav_order: 6
1010

1111
### ParseConflictOptions
1212

13-
Defined in: [file-parser.ts:24](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L24)
13+
Defined in: [file-parser.ts:24](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L24)
1414

1515
Options for parsing conflicted content.
1616

@@ -20,7 +20,7 @@ Options for parsing conflicted content.
2020

2121
> `optional` **filename**: `string`
2222
23-
Defined in: [file-parser.ts:42](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L42)
23+
Defined in: [file-parser.ts:42](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L42)
2424

2525
Optional filename hint to prioritize parser choice.
2626
Example:
@@ -34,7 +34,7 @@ If extension is unknown, falls back to `parsers` or `"json"`.
3434

3535
> `optional` **parsers**: [`SupportedParsers`](#supportedparsers) \| `"auto"` \| [`SupportedParsers`](#supportedparsers)[]
3636
37-
Defined in: [file-parser.ts:32](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L32)
37+
Defined in: [file-parser.ts:32](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L32)
3838

3939
Parsers to attempt, in order:
4040

@@ -47,7 +47,7 @@ Defaults to `"json"`.
4747

4848
### ParsedConflict\<T\>
4949

50-
Defined in: [file-parser.ts:6](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L6)
50+
Defined in: [file-parser.ts:6](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L6)
5151

5252
Represents a parsed conflict from a file with `ours` and `theirs` versions.
5353

@@ -65,23 +65,23 @@ The type of the parsed content.
6565

6666
> **format**: `string`
6767
68-
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L12)
68+
Defined in: [file-parser.ts:12](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L12)
6969

7070
Format used to parse the content (`json`, `yaml`, `toml`, `xml`, or `custom`).
7171

7272
##### ours
7373

7474
> **ours**: `T`
7575
76-
Defined in: [file-parser.ts:8](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L8)
76+
Defined in: [file-parser.ts:8](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L8)
7777

7878
Parsed content from the "ours" side of the conflict.
7979

8080
##### theirs
8181

8282
> **theirs**: `T`
8383
84-
Defined in: [file-parser.ts:10](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L10)
84+
Defined in: [file-parser.ts:10](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L10)
8585

8686
Parsed content from the "theirs" side of the conflict.
8787

@@ -91,7 +91,7 @@ Parsed content from the "theirs" side of the conflict.
9191

9292
> **Parser** = \{ `name`: `string`; `parser`: (`input`: `string`) => `unknown`; \}
9393
94-
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L16)
94+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L16)
9595

9696
A parser function that takes a raw string and returns parsed content.
9797

@@ -101,13 +101,13 @@ A parser function that takes a raw string and returns parsed content.
101101

102102
> **name**: `string`
103103
104-
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L16)
104+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L16)
105105

106106
##### parser()
107107

108108
> **parser**: (`input`: `string`) => `unknown`
109109
110-
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L16)
110+
Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L16)
111111

112112
###### Parameters
113113

@@ -125,7 +125,7 @@ Defined in: [file-parser.ts:16](https://github.com/react18-tools/git-json-resolv
125125

126126
> **SupportedParsers** = `"json"` \| `"json5"` \| `"yaml"` \| `"toml"` \| `"xml"` \| [`Parser`](#parser)
127127
128-
Defined in: [file-parser.ts:19](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L19)
128+
Defined in: [file-parser.ts:19](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L19)
129129

130130
Built-in parser identifiers or a custom parser function.
131131

@@ -135,7 +135,7 @@ Built-in parser identifiers or a custom parser function.
135135

136136
> **parseConflictContent**\<`T`\>(`content`: `string`, `options`: [`ParseConflictOptions`](#parseconflictoptions)): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`ParsedConflict`](#parsedconflict)\<`T`\>\>
137137
138-
Defined in: [file-parser.ts:62](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-parser.ts#L62)
138+
Defined in: [file-parser.ts:62](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-parser.ts#L62)
139139

140140
Parses a conflicted file's content into separate `ours` and `theirs` objects.
141141

docs/file-serializer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ nav_order: 8
1212

1313
> **serialize**(`format`: `string`, `value`: `unknown`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`string`\>
1414
15-
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/file-serializer.ts#L1)
15+
Defined in: [file-serializer.ts:1](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/file-serializer.ts#L1)
1616

1717
#### Parameters
1818

docs/logger/-internal-.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ nav_order: 20
1111

1212
### LoggerConfig
1313

14-
Defined in: [logger.ts:8](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L8)
14+
Defined in: [logger.ts:8](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L8)
1515

1616
#### Properties
1717

1818
##### levels?
1919

2020
> `optional` **levels**: \{ `file?`: [`LogLevel`](#loglevel)[]; `stdout?`: [`LogLevel`](#loglevel)[]; \}
2121
22-
Defined in: [logger.ts:12](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L12)
22+
Defined in: [logger.ts:12](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L12)
2323

2424
###### file?
2525

@@ -33,32 +33,32 @@ Defined in: [logger.ts:12](https://github.com/react18-tools/git-json-resolver/bl
3333

3434
> `optional` **logDir**: `string`
3535
36-
Defined in: [logger.ts:10](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L10)
36+
Defined in: [logger.ts:10](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L10)
3737

3838
##### mode?
3939

4040
> `optional` **mode**: [`Mode`](#mode-1)
4141
42-
Defined in: [logger.ts:9](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L9)
42+
Defined in: [logger.ts:9](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L9)
4343

4444
##### singleFile?
4545

4646
> `optional` **singleFile**: `boolean`
4747
48-
Defined in: [logger.ts:11](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L11)
48+
Defined in: [logger.ts:11](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L11)
4949

5050
## Type Aliases
5151

5252
### LogLevel
5353

5454
> **LogLevel** = `"info"` \| `"warn"` \| `"error"` \| `"debug"`
5555
56-
Defined in: [logger.ts:4](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L4)
56+
Defined in: [logger.ts:4](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L4)
5757

5858
---
5959

6060
### Mode
6161

6262
> **Mode** = `"memory"` \| `"stream"`
6363
64-
Defined in: [logger.ts:6](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L6)
64+
Defined in: [logger.ts:6](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L6)

docs/logger/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ nav_order: 21
1717

1818
> `const` **globalLogger**: \{ `debug`: (`fileId`: `string`, `msg`: `string`) => `void`; `error`: (`fileId`: `string`, `msg`: `string`) => `void`; `flush`: () => `void`; `info`: (`fileId`: `string`, `msg`: `string`) => `void`; `warn`: (`fileId`: `string`, `msg`: `string`) => `void`; \}
1919
20-
Defined in: [logger.ts:87](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L87)
20+
Defined in: [logger.ts:87](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L87)
2121

2222
#### Type Declaration
2323

@@ -107,7 +107,7 @@ Defined in: [logger.ts:87](https://github.com/react18-tools/git-json-resolver/bl
107107

108108
> **createLogger**(`config`: [`LoggerConfig`](-internal-.md#loggerconfig)): \{ `debug`: (`fileId`: `string`, `msg`: `string`) => `void`; `error`: (`fileId`: `string`, `msg`: `string`) => `void`; `flush`: () => `void`; `info`: (`fileId`: `string`, `msg`: `string`) => `void`; `warn`: (`fileId`: `string`, `msg`: `string`) => `void`; \}
109109
110-
Defined in: [logger.ts:24](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/logger.ts#L24)
110+
Defined in: [logger.ts:24](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/logger.ts#L24)
111111

112112
#### Parameters
113113

docs/matcher.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ nav_order: 10
1010

1111
### Matcher
1212

13-
Defined in: [matcher.ts:13](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/matcher.ts#L13)
13+
Defined in: [matcher.ts:13](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/matcher.ts#L13)
1414

1515
Matcher abstraction + adapters for micromatch/picomatch (optional).
1616

@@ -29,7 +29,7 @@ Micromatch/Picomatch can be loaded at runtime as optional peers.
2929

3030
> **isMatch**: (`str`: `string`, `patterns`: `string`[]) => `boolean`
3131
32-
Defined in: [matcher.ts:17](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/matcher.ts#L17)
32+
Defined in: [matcher.ts:17](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/matcher.ts#L17)
3333

3434
Returns true if `str` matches at least one of the provided glob `patterns`.
3535

@@ -53,7 +53,7 @@ Returns true if `str` matches at least one of the provided glob `patterns`.
5353

5454
> `const` **basicMatcher**: [`Matcher`](#matcher)
5555
56-
Defined in: [matcher.ts:28](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/matcher.ts#L28)
56+
Defined in: [matcher.ts:28](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/matcher.ts#L28)
5757

5858
Minimal homegrown matcher (default).
5959
Supports:
@@ -69,7 +69,7 @@ Supports:
6969

7070
> **loadMatcher**(`name`: `"micromatch"` \| `"picomatch"`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<[`Matcher`](#matcher)\>
7171
72-
Defined in: [matcher.ts:41](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/matcher.ts#L41)
72+
Defined in: [matcher.ts:41](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/matcher.ts#L41)
7373

7474
Attempts to load a named matcher adapter.
7575

docs/merger/-internal-.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ nav_order: 23
1111

1212
### MergeArgs\<TContext\>
1313

14-
Defined in: [merger.ts:50](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L50)
14+
Defined in: [merger.ts:50](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L50)
1515

1616
Internal args passed to strategies.
1717

@@ -27,40 +27,40 @@ Internal args passed to strategies.
2727

2828
> `optional` **base**: `unknown`
2929
30-
Defined in: [merger.ts:53](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L53)
30+
Defined in: [merger.ts:53](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L53)
3131

3232
##### conflicts
3333

3434
> **conflicts**: [`Conflict`](README.md#conflict)[]
3535
36-
Defined in: [merger.ts:57](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L57)
36+
Defined in: [merger.ts:57](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L57)
3737

3838
##### ctx
3939

4040
> **ctx**: [`MergeContext`](README.md#mergecontext)\<`TContext`\>
4141
42-
Defined in: [merger.ts:56](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L56)
42+
Defined in: [merger.ts:56](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L56)
4343

4444
##### filePath?
4545

4646
> `optional` **filePath**: `string`
4747
48-
Defined in: [merger.ts:55](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L55)
48+
Defined in: [merger.ts:55](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L55)
4949

5050
##### ours
5151

5252
> **ours**: `unknown`
5353
54-
Defined in: [merger.ts:51](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L51)
54+
Defined in: [merger.ts:51](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L51)
5555

5656
##### path
5757

5858
> **path**: `string`
5959
60-
Defined in: [merger.ts:54](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L54)
60+
Defined in: [merger.ts:54](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L54)
6161

6262
##### theirs
6363

6464
> **theirs**: `unknown`
6565
66-
Defined in: [merger.ts:52](https://github.com/react18-tools/git-json-resolver/blob/dc8d77b61daa61f118acc2f74e260f814fc055fe/lib/src/merger.ts#L52)
66+
Defined in: [merger.ts:52](https://github.com/react18-tools/git-json-resolver/blob/ea7c4933c584c1efc40c46f3e2b08af2e6adef36/lib/src/merger.ts#L52)

0 commit comments

Comments
 (0)