Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions acceptance/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,10 @@ out.test.toml linguist-generated=true
# Do not mark generated files as conflicted, they should simply be regenerated.
# Note, you need top run .gitconfig.install to enable 'ours' driver
out* merge=ours

# Acceptance test scripts have no file extension and most have no shebang, so
# GitHub's linguist treats them as plain text. Force Shell so they get syntax
# highlighting in blob and diff views, which makes reviewing them easier.
script linguist-language=Shell
script.prepare linguist-language=Shell
script.cleanup linguist-language=Shell
Comment thread
janniklasrose marked this conversation as resolved.
Loading