Skip to content

Do not hide out.test.toml in PR diffs #6913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denik merged 1 commit into from
Oct 2, 2026
Merged

Do not hide out.test.toml in PR diffs #6913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions acceptance/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
*.lvdash.json text eol=lf
*.geniespace.json text eol=lf

# The out.test.toml file is autogenerated based on the merged test.toml view.
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
Expand Down
Loading