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

Merge 7224155031 into cc064349ac

Enno 2025-11-24 15:26:12 +07:00 committed by GitHub
parent cc064349ac 7224155031
commit eaad2f4c21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manual/src/git.md
Unescape Escape View File

@ -112,7 +112,7 @@ To define a difftool named `difftastic`, add the following to your
```ini ```ini
[difftool "difftastic"] [difftool "difftastic"]
# See `man git-difftool` for a description of MERGED, LOCAL and REMOTE. # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE.
cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" cmd = difft \"$MERGED\" \"$LOCAL\" \"abcdef1\" \"100644\" \"$REMOTE\" \"abcdef2\" \"100644\"
``` ```
You can now use difftastic as a difftool: You can now use difftastic as a difftool: