Commit 9c77bc6

committed

docs: fix

1 parent b8cd241 commit 9c77bc6Copy full SHA for 9c77bc6

File tree

+13

-12

lines changed

+13

-12

lines changed

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,17 +192,18 @@ index 2445f65,f4b8569..0000000`
`192`	`192`	`+++ b/README.md`
`193`	`193`	`@@@ -8,7 -8,7 +8,11 @@@`
`194`	`194`	`npm install parse-git-diff`
`195`		-```
`196`		`-`
	`195`	`+`
	`196`	`+`
`197`	`197`	`++<<<<<<< HEAD`
`198`		`-+## a`
	`198`	`++## a`
`199`	`199`	`++=======`
`200`		`-`
`201`		`--## b`
`202`		`- ++>>>>>>> branch-b`
	`200`	`++ ## b`
	`201`	`+++>>>>>>> branch-b`
	`202`	`+`
`203`	`203`	`- [demo](https://yeonjuan.github.io/parse-git-diff/)`
`204`		`-`
`205`		-````
	`204`	`+`
	`205`	`+`
	`206`	+```
`206`	`207`
`207`	`208`	`<!-- end:conflict-file-input -->`
`208`	`209`
`@@ -242,7 +243,7 @@ index 2445f65,f4b8569..0000000`
`242`	`243`	`"type": "UnchangedLine",`
`243`	`244`	`"lineBefore": 9,`
`244`	`245`	`"lineAfter": 9,`
`245`		- "content": " ```"
	`246`	`+ "content": " "`
`246`	`247`	`},`
`247`	`248`	`{`
`248`	`249`	`"type": "UnchangedLine",`
`@@ -307,7 +308,7 @@ index 2445f65,f4b8569..0000000`
`307`	`308`	`}`
`308`	`309`	`]`
`309`	`310`	`}`
`310`		-````
	`311`	+```
`311`	`312`
`312`	`313`	`<!-- end:conflict-file-output -->`
`313`	`314`

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Comments

(0)