sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update paths for sample files

pull/25/head
Wilfred Hughes 2019-11-18 13:49:39 +07:00
parent f81a982807
commit e326efddcf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
Unescape Escape View File

@ -26,7 +26,7 @@ Variations, Myers
```
# Modern diff supports colour, but see also
# https://www.colordiff.org/
$ diff --color=always -u css_before.css css_after.css
$ diff --color=always -u sample_files/css_before.css sample_files/css_after.css
```
Note that GNU diff [originally used the Hunt-McIlroy
@ -72,11 +72,11 @@ work](https://stackoverflow.com/questions/40133534/is-gits-implementation-of-the
```
# Original behaviour
$ git diff --no-indent-heuristic --no-index css_before.css css_after.css
$ git diff --no-indent-heuristic --no-index sample_files/css_before.css sample_files/css_after.css
# As of git 2.11, this heuristic is enabled by default.
$ git diff --indent-heuristic --no-index css_before.css css_after.css
$ git diff --indent-heuristic --no-index sample_files/css_before.css sample_files/css_after.css
# Patience algorithm does a better a job in this example.
$ git diff --patience --no-index css_before.css css_after.css
$ git diff --patience --no-index sample_files/css_before.css sample_files/css_after.css
```
### Histogram Diff
@ -88,5 +88,5 @@ of the patience algorithm](https://github.com/git/git/commit/85551232b56e763ecfc
```
# Inferior to patience on this example file.
$ git diff --histogram --no-index css_before.css css_after.css
$ git diff --histogram --no-index sample_files/css_before.css sample_files/css_after.css
```