git: Enable Mergiraf as a merge driver
This commit is contained in:
parent
fd0960254d
commit
95a1d578fb
2 changed files with 28 additions and 0 deletions
|
@ -1,3 +1,28 @@
|
|||
package-lock.json binary
|
||||
Cargo.lock binary
|
||||
stack.yaml.lock binary
|
||||
|
||||
*.java merge=mergiraf
|
||||
*.rs merge=mergiraf
|
||||
*.go merge=mergiraf
|
||||
*.js merge=mergiraf
|
||||
*.jsx merge=mergiraf
|
||||
*.json merge=mergiraf
|
||||
*.yml merge=mergiraf
|
||||
*.yaml merge=mergiraf
|
||||
*.toml merge=mergiraf
|
||||
*.html merge=mergiraf
|
||||
*.htm merge=mergiraf
|
||||
*.xhtml merge=mergiraf
|
||||
*.xml merge=mergiraf
|
||||
*.c merge=mergiraf
|
||||
*.cc merge=mergiraf
|
||||
*.h merge=mergiraf
|
||||
*.cpp merge=mergiraf
|
||||
*.hpp merge=mergiraf
|
||||
*.cs merge=mergiraf
|
||||
*.dart merge=mergiraf
|
||||
*.scala merge=mergiraf
|
||||
*.sbt merge=mergiraf
|
||||
*.ts merge=mergiraf
|
||||
*.py merge=mergiraf
|
||||
|
|
|
@ -57,6 +57,9 @@
|
|||
conflictstyle = zdiff3
|
||||
ff = only
|
||||
tool = nvimdiff1
|
||||
[merge "mergiraf"]
|
||||
name = mergiraf
|
||||
driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P
|
||||
[mergetool]
|
||||
hideResolved = false
|
||||
keepBackup = false
|
||||
|
|
Loading…
Reference in a new issue