Downloads
Reference
Learning
Security
Source
API Documentation
merge
GIT_MERGE_CONFLICT_MARKER_SIZE
Version:
main
v1.9.0
v1.8.4
v1.8.3
v1.8.2
v1.8.2-rc1
v1.8.1
v1.8.0
v1.7.2
v1.7.1
v1.7.0
v1.6.5
v1.6.4
v1.6.3
v1.6.2
v1.6.1
v1.5.2
v1.5.1
v1.5.0
v1.4.6
v1.4.5
v1.4.4
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.3.2
v1.3.1
v1.3.0
v1.2.0
v1.1.1
v1.1.0
v1.0.1
v1.0.0
v0.99.0
v0.28.5
v0.28.4
v0.28.3
v0.28.2
v0.28.1
v0.28.0
v0.28.0-rc1
v0.27.10
v0.27.9
v0.27.8
v0.27.7
v0.27.6
v0.27.5
v0.27.4
v0.27.3
v0.27.2
v0.27.1
v0.27.0
v0.27.0-rc3
v0.27.0-rc2
v0.27.0-rc1
Default size for conflict markers
Signature
GitHub
#define GIT_MERGE_CONFLICT_MARKER_SIZE 7
Versions
main
v1.9.0
v1.8.4
v1.8.3
v1.8.2
v1.8.2-rc1
v1.8.1
v1.8.0
v1.7.2
v1.7.1
v1.7.0
v1.6.5
v1.6.4
v1.6.3
v1.6.2
v1.6.1
v1.5.2
v1.5.1
v1.5.0
v1.4.6
v1.4.5
v1.4.4
v1.4.3
v1.4.2
v1.4.1
v1.4.0
v1.3.2
v1.3.1
v1.3.0
v1.2.0
v1.1.1
v1.1.0
v1.0.1
v1.0.0
v0.99.0
v0.28.5
v0.28.4
v0.28.3
v0.28.2
v0.28.1
v0.28.0
v0.28.0-rc1
v0.27.10
v0.27.9
v0.27.8
v0.27.7
v0.27.6
v0.27.5
v0.27.4
v0.27.3
v0.27.2
v0.27.1
v0.27.0
v0.27.0-rc3
v0.27.0-rc2
v0.27.0-rc1
