Skip to content

Commit 3a0ec64

Browse files
Merge branch 'master' into next
2 parents 31cdf3f + 80b7dad commit 3a0ec64

File tree

3 files changed

+1395
-3
lines changed

3 files changed

+1395
-3
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ perl:
1515
matrix:
1616
include:
1717
- os: osx
18-
osx_image: xcode9.4
18+
osx_image: xcode12.2
1919
language: generic
20-
perl: 5.24
20+
perl: 5.30
2121
allow_failures:
2222
- perl: "blead"
2323

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ Vanilla `git diff` vs `git` and `diff-so-fancy`
1212

1313
Installation is as simple as cloning this repo and then putting the `diff-so-fancy` script in to your `$PATH`. The `lib/` directory will need to be kept relative to the core script.
1414

15-
`diff-so-fancy` is also available from NPM, Nix, brew, and as a package on Arch and Debian Linux.
15+
`diff-so-fancy` is also available from the [NPM registry](https://www.npmjs.com/package/diff-so-fancy), [brew](https://formulae.brew.sh/formula/diff-so-fancy), and as a package on [Nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix), in the [Arch community repo](https://archlinux.org/packages/community/any/diff-so-fancy/), and [ppa:aos for Debian/Ubuntu Linux](https://github.com/aos/dsf-debian).
16+
17+
Issues relating to packaging ('installation does not work', 'version is out of date', etc.) should be directed to those packages' own repositories/issue trackers where applicable.
1618

1719
**Note:** Windows users may need to install [MinGW](https://sourceforge.net/projects/mingw/files/) or the [Windows subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
1820

0 commit comments

Comments
 (0)