Skip to content

Commit

Permalink
Merge branch 'master' of github.com:so-fancy/diff-so-fancy
Browse files Browse the repository at this point in the history
  • Loading branch information
scottchiefbaker committed Dec 28, 2017
2 parents 64be3de + d41044d commit d2b7286
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Vanilla `git diff` vs `git` and `diff-so-fancy`

Installation is as simple as downloading the [diff-so-fancy](https://raw.githubusercontent.com/so-fancy/diff-so-fancy/master/third_party/build_fatpack/diff-so-fancy) script to a directory in your path

`diff-so-fancy` is also available from NPM, brew, and as a package on Arch Linux.
`diff-so-fancy` is also available from NPM, Nix, brew, and as a package on Arch Linux.

## Usage

Expand Down Expand Up @@ -73,7 +73,7 @@ git config --bool --global diff-so-fancy.useUnicodeRuler false

## Contributing

Pull requests are quite welcome, and should target the `next` branch. We are also looking for any feedback or ideas on how to make diff-so-fancy even better.
Pull requests are quite welcome, and should target the [`next` branch](https://github.com/so-fancy/diff-so-fancy/tree/next). We are also looking for any feedback or ideas on how to make diff-so-fancy even better.

### Other documentation

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "diff-so-fancy",
"version": "1.0.0",
"version": "1.1.1",
"description": "Good-lookin' diffs with diff-highlight and more",
"bin": {
"diff-so-fancy": "diff-so-fancy"
Expand Down

0 comments on commit d2b7286

Please sign in to comment.