diff --git a/manual/src/diffing.md b/manual/src/diffing.md index 241e330ba..1e382ae8d 100644 --- a/manual/src/diffing.md +++ b/manual/src/diffing.md @@ -49,7 +49,6 @@ From the start vertex, we have two options: +---------------------+ +---------------------+ ``` - Choosing "novel atom R" to vertex 2 will turn out to be the best choice. From vertex 2, we can see three routes to the end vertex. diff --git a/manual/src/installation.md b/manual/src/installation.md index 273dada05..95400d9bd 100644 --- a/manual/src/installation.md +++ b/manual/src/installation.md @@ -4,8 +4,12 @@ Difftastic can be installed as pre-built binaries or using various package manag ## Pre-Built Binaries -Difftastic releases are published as [GitHub releases](https://github.com/Wilfred/difftastic/releases) with pre-built binaries for Windows, macOS and Linux. -Open the [latest release page](https://github.com/Wilfred/difftastic/releases/latest), download the file matching your OS and CPU architecture, and extract the `difft` executable application file. +Difftastic releases are published as [GitHub +releases](https://github.com/Wilfred/difftastic/releases) with +pre-built binaries for Windows, macOS and Linux. Open the [latest +release page](https://github.com/Wilfred/difftastic/releases/latest), +download the file matching your OS and CPU architecture, and extract +the `difft` executable application file. ## Package Manager @@ -36,7 +40,9 @@ with `nix-env`. $ nix-env --install difftastic ``` -If you're a **Fedora** user, you can install [difftastic](https://packages.fedoraproject.org/pkgs/rust-difftastic/difftastic/) with `dnf`. +If you're a **Fedora** user, you can install +[difftastic](https://packages.fedoraproject.org/pkgs/rust-difftastic/difftastic/) +with `dnf`. ``` $ sudo dnf install difftastic @@ -52,7 +58,8 @@ $ sudo pkg install difftastic ### Windows -If you're a Windows user using **Windows Package Manager** (*WinGet*), you can install difftastic with `winget`. +If you're a Windows user using **Windows Package Manager** (*WinGet*), +you can install difftastic with `winget`. ``` $ winget install difftastic diff --git a/manual/src/jj.md b/manual/src/jj.md index 585641cf1..43bbebf4a 100644 --- a/manual/src/jj.md +++ b/manual/src/jj.md @@ -11,5 +11,3 @@ file](https://jj-vcs.github.io/jj/latest/config/#user-config-files). [ui] diff-formatter = ["difft", "--color=always", "$left", "$right"] ``` - - diff --git a/manual/src/parser_vendoring.md b/manual/src/parser_vendoring.md index a5b3f9b5d..054450d29 100644 --- a/manual/src/parser_vendoring.md +++ b/manual/src/parser_vendoring.md @@ -27,7 +27,7 @@ $ ln -s tree-sitter-json/src tree-sitter-json-src ``` You can now add the parser to build by including the directory in -`build.rs`. +`build.rs`. ``` TreeSitterParser {