mirror of
https://git.proxmox.com/git/libgit2
synced 2025-06-04 01:17:15 +00:00

Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.
8 lines
137 B
Plaintext
8 lines
137 B
Plaintext
[core]
|
|
repositoryformatversion = 0
|
|
filemode = true
|
|
bare = false
|
|
logallrefupdates = true
|
|
ignorecase = true
|
|
precomposeunicode = true
|