diff --git a/.gitattributes b/.gitattributes index 9ebeba4883..32985d0606 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ *.a binary *.patch binary +Cargo.lock binary # Default conflict marker size is 7 which causes some of the headings in # release-notes.txt to trigger git diff --check: 'leftover conflict marker' # when the heading is exactly 7 characters long.