mirror of
https://github.com/signalapp/libsignal.git
synced 2024-09-20 03:52:17 +02:00
10 lines
366 B
Plaintext
10 lines
366 B
Plaintext
# Prevent auto-merging of generated acknowledgment files
|
|
acknowledgments/acknowledgments.* -merge -text
|
|
acknowledgments/acknowledgments.*.hbs merge text=auto
|
|
|
|
# Treat encrypted and unencrypted message backup files as binary
|
|
**/*.binproto binary
|
|
**/*.binproto.encrypted binary
|
|
|
|
# Avoid Windows line-endings for files compared literally.
|
|
**/*.expected.json text eol=lf |