mirror of https://github.com/Wilfred/difftastic/
393845ddcb
`git-difftool` has strictly less information than `git-diff`. `git-difftool` therefore produces worse results, and we shouldn't recommend it. `git-difftool` does not have file rename information, and sometimes makes difftastic claim that file permissions have changed (depending on the permissions of the temporary directory used). Instead, recommend `git-diff` with an external diff configured, and update `git-mergetool` instructions to emulate `git-diff` as much as possible (respecting $MERGED). Also link to the upstream git bug on segfaults with external diff tools. Thanks to @poliorcetics and @gthb for researching this bug and discussing possible solutions. Closes #734 Fixes #620 |
||
|---|---|---|
| .. | ||
| src | ||
| theme | ||
| .gitignore | ||
| book.toml | ||
| replace_version_placeholder.sh | ||