dotfiles

*.java merge=mergiraf
*.properties merge=mergiraf
*.kt merge=mergiraf
*.rs merge=mergiraf
*.go merge=mergiraf
*.js merge=mergiraf
*.jsx merge=mergiraf
*.mjs 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
*.h merge=mergiraf
*.cc merge=mergiraf
*.hh merge=mergiraf
*.cpp merge=mergiraf
*.hpp merge=mergiraf
*.cxx merge=mergiraf
*.hxx merge=mergiraf
*.c++ merge=mergiraf
*.h++ merge=mergiraf
*.mpp merge=mergiraf
*.cppm merge=mergiraf
*.ixx merge=mergiraf
*.tcc merge=mergiraf
*.cs merge=mergiraf
*.dart merge=mergiraf
*.dts merge=mergiraf
*.scala merge=mergiraf
*.sbt merge=mergiraf
*.ts merge=mergiraf
*.tsx merge=mergiraf
*.py merge=mergiraf
*.php merge=mergiraf
*.phtml merge=mergiraf
*.sol merge=mergiraf
*.lua merge=mergiraf
*.rb merge=mergiraf
*.nix merge=mergiraf
*.sv merge=mergiraf
*.svh merge=mergiraf

# Diff drivers select hunk headers, word-diff boundaries, and `grep -W` context.
# Every driver below ships with git except `zig`, which is defined in gitconfig.
# One pattern per line: gitattributes reads the first field as the pattern.
*.adb diff=ada
*.ads diff=ada
*.bash diff=bash
*.bib diff=bibtex
*.c diff=cpp
*.cc diff=cpp
*.cpp diff=cpp
*.cxx diff=cpp
*.h diff=cpp
*.hh diff=cpp
*.hpp diff=cpp
*.hxx diff=cpp
*.cs diff=csharp
*.css diff=css
*.dts diff=dts
*.dtsi diff=dts
*.ex diff=elixir
*.exs diff=elixir
*.f diff=fortran
*.f90 diff=fortran
*.f95 diff=fortran
*.go diff=golang
*.htm diff=html
*.html diff=html
*.xhtml diff=html
*.java diff=java
*.kt diff=kotlin
*.kts diff=kotlin
*.lua diff=lua
*.markdown diff=markdown
*.md diff=markdown
*.mm diff=objc
*.pas diff=pascal
*.pp diff=pascal
*.php diff=php
*.phtml diff=php
*.pl diff=perl
*.pm diff=perl
*.py diff=python
*.R diff=r
*.rb diff=ruby
*.rs diff=rust
*.scm diff=scheme
*.ss diff=scheme
*.cls diff=tex
*.sty diff=tex
*.tex diff=tex
*.zig diff=zig
*.zon diff=zig

# textconv: make opaque formats reviewable.
*.class diff=javap
*.jar diff=zip
*.war diff=zip
*.apk diff=zip
*.docx diff=pandoc
*.odt diff=pandoc

# Config languages git ships no driver for.
*.toml diff=toml
*.yaml diff=yaml
*.yml diff=yaml

# Append-only files: keep both sides instead of conflicting.
CHANGELOG.md merge=union
.gitignore merge=union