0.11.0
版本发布时间: 2021-12-06 09:18:53
dandavison/delta最新发布版本:0.18.2(2024-09-11 20:37:21)
This release adds handling of merge conflicts and the "combined" diff format which git uses for merge commits; see the Merge conflicts README section and https://github.com/dandavison/delta/issues/189. Please consider setting
[merge]
conflictstyle = diff3
With that setting, when a merge conflict is encountered, delta will display diffs between the ancestral commit and each of the two merge parents:
 |
PRs
- Handle combined diff format and merge conflicts by @dandavison in https://github.com/dandavison/delta/pull/812
- Handle failure to parse non hunk header by @dandavison in https://github.com/dandavison/delta/pull/823
Full Changelog: https://github.com/dandavison/delta/compare/0.10.3...0.11.0
1、 delta-0.11.0-aarch64-unknown-linux-gnu.tar.gz 2.33MB
2、 delta-0.11.0-arm-unknown-linux-gnueabihf.tar.gz 2.36MB
3、 delta-0.11.0-i686-unknown-linux-gnu.tar.gz 2.63MB
4、 delta-0.11.0-x86_64-apple-darwin.tar.gz 2.36MB
5、 delta-0.11.0-x86_64-pc-windows-msvc.zip 2.61MB
6、 delta-0.11.0-x86_64-unknown-linux-gnu.tar.gz 2.47MB
7、 delta-0.11.0-x86_64-unknown-linux-musl.tar.gz 2.51MB
8、 git-delta-musl_0.11.0_amd64.deb 1.99MB
9、 git-delta_0.11.0_amd64.deb 1.94MB
10、 git-delta_0.11.0_arm64.deb 1.77MB
11、 git-delta_0.11.0_armhf.deb 1.77MB
12、 git-delta_0.11.0_i386.deb 2.08MB