diff options
Diffstat (limited to 'home/.config/git/attributes')
| -rw-r--r-- | home/.config/git/attributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/home/.config/git/attributes b/home/.config/git/attributes index 1870ab4..a9faf44 100644 --- a/home/.config/git/attributes +++ b/home/.config/git/attributes @@ -21,4 +21,6 @@ *.scala merge=mergiraf *.sbt merge=mergiraf *.ts merge=mergiraf +*.tsx merge=mergiraf *.py merge=mergiraf +*.lua merge=mergiraf |