Skip to content

Commit 0ab63b0

Browse files
author
Rodrigo Fernandes
committed
Merge pull request #1 from rtfpessoa/multiline-diff-blocks
Multiline diff blocks
2 parents c5f2088 + e1d7088 commit 0ab63b0

File tree

5 files changed

+29
-551
lines changed

5 files changed

+29
-551
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Diff to Html Node Module by [rtfpessoa](https://github.com/rtfpessoa)
1+
# Diff to Html Node Module (CLI) by [rtfpessoa](https://github.com/rtfpessoa)
22

33
Diff to Html generates pretty HTML diffs.
44

55
### Inspiration
66

7-
This project uses [diff2html](https://github.com/rtfpessoa/diff2html) as base.
7+
This project is just a CLI for [diff2html-nodejs](https://github.com/rtfpessoa/diff2html-nodejs).
88

99
## Features
1010

@@ -26,9 +26,11 @@ This project uses [diff2html](https://github.com/rtfpessoa/diff2html) as base.
2626

2727
* Manually download and import [diff2html.js](https://github.com/rtfpessoa/diff2html) into your page
2828

29+
* Import Node library [diff2html-nodejs](https://github.com/rtfpessoa/diff2html-nodejs) into your package.json
30+
2931
## Setup
3032

31-
sudo npm install -g diff2html
33+
sudo npm install -g diff2html-cli
3234

3335
## Usage
3436

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "diff2html",
3-
"version": "0.1.9",
2+
"name": "diff2html-cli",
3+
"version": "0.2.0-3",
44

5-
"homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs",
5+
"homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs-cli",
66
"description": "Fast Diff to colorized HTML",
77
"keywords": [
88
"git",
@@ -29,15 +29,15 @@
2929

3030
"repository": {
3131
"type": "git",
32-
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs.git"
32+
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs-cli.git"
3333
},
3434

3535
"bugs": {
36-
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs/issues"
36+
"url": "https://www.github.com/rtfpessoa/diff2html-nodejs-cli/issues"
3737
},
3838

3939
"engines": {
40-
"node": ">=0.10"
40+
"node": ">=0.12.2"
4141
},
4242

4343
"preferGlobal": "true",
@@ -50,12 +50,13 @@
5050
"diff2html": "./bin/diff2html"
5151
},
5252

53-
"main": "./src/diff2html.js",
53+
"main": "./src/main.js",
5454

5555
"dependencies": {
5656
"commander": "2.7.1",
5757
"extend": "2.0.0",
58-
"pkginfo": "0.3.0"
58+
"pkginfo": "0.3.0",
59+
"diff2html": "0.2.0-7"
5960
},
6061

6162
"devDependencies": {
@@ -64,7 +65,7 @@
6465
"licenses": [
6566
{
6667
"type": "MIT",
67-
"url": "https://github.com/rtfpessoa/diff2html-node/blob/master/LICENSE"
68+
"url": "https://github.com/rtfpessoa/diff2html-node-cli/blob/master/LICENSE"
6869
}
6970
],
7071

0 commit comments

Comments
 (0)