Git: Cleanup
This commit is contained in:
parent
68f3460ab8
commit
3778c79643
2
git/.gitattributes
vendored
2
git/.gitattributes
vendored
@ -1 +1,3 @@
|
|||||||
*.* diff=delta
|
*.* diff=delta
|
||||||
|
*.yaml diff=dyff
|
||||||
|
*.yml diff=dyff
|
||||||
|
@ -41,5 +41,3 @@
|
|||||||
command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
|
command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
|
||||||
[merge]
|
[merge]
|
||||||
tool = smerge
|
tool = smerge
|
||||||
[safe]
|
|
||||||
directory = /opt/flutter
|
|
||||||
|
Loading…
Reference in New Issue
Block a user