playground
/
flask
mirror of https://github.com/mitsuhiko/flask.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Set merge strategy for CHANGES

pull/2024/head
Armin Ronacher 9 years ago
parent
83fd5b26b8
commit
0664a3f2dd
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitattributes

1
.gitattributes vendored
Unescape View File

@ -0,0 +1 @@
CHANGES merge=union
Write Preview
Loading…
Cancel
Save