History

gitattributes: End merge conflicts in Changelog

Similar could be done with other lists that generally are appended to

Michael Niedermayer committed 1 year ago

Commit efdf7511 parent 94beaf41 file · +1 −0Browse files

Unified · Split

.gitattributes+1−0
@@ -1 +1,2 @@
11 *.pnm -diff -text
2+Changelog merge=union

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t