ba6aaa0e0a
Mergiraf expects merge.conflictStyle to be "diff3" in git. If this isn't the case, mergiraf cannot operate correctly. This change adds this option to git's configuration.
12 lines
232 B
Text
12 lines
232 B
Text
[gpg]
|
|
format = "openpgp"
|
|
|
|
[gpg "openpgp"]
|
|
program = "@gnupg@/bin/gpg"
|
|
|
|
[merge]
|
|
conflictStyle = "diff3"
|
|
|
|
[merge "mergiraf"]
|
|
driver = "@mergiraf@/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"
|
|
name = "mergiraf"
|