Downloads
Reference
Learning
Security
Source
API Documentation
merge
git_merge_file_flags_t
Version:
v0.23.4
v0.23.3
v0.23.2
v0.23.1
v0.23.0
v0.23.0-rc2
v0.23.0-rc1
v0.22.3
v0.22.2
v0.22.1
v0.22.0
v0.22.0-rc2
v0.22.0-rc1
v0.21.5
v0.21.4
v0.21.3
v0.21.2
v0.21.1
v0.21.0
v0.21.0-rc2
v0.21.0-rc1
Values
GitHub
GIT_MERGE_FILE_DEFAULT
0
GIT_MERGE_FILE_STYLE_MERGE
(1 << 0)
GIT_MERGE_FILE_STYLE_DIFF3
(1 << 1)
GIT_MERGE_FILE_SIMPLIFY_ALNUM
(1 << 2)
Versions
v0.23.4
v0.23.3
v0.23.2
v0.23.1
v0.23.0
v0.23.0-rc2
v0.23.0-rc1
v0.22.3
v0.22.2
v0.22.1
v0.22.0
v0.22.0-rc2
v0.22.0-rc1
v0.21.5
v0.21.4
v0.21.3
v0.21.2
v0.21.1
v0.21.0
v0.21.0-rc2
v0.21.0-rc1