Skip to content
GitLab
Explore
Sign in
Tomaz Canabrava
kdevelop
Repository
kdevelop
.gitattributes
Find file
Blame
History
Permalink
Merge .desktop files using the 'ours' strategy.
· 43065247
Milian Wolff
authored
Jan 17, 2013
To use this on your own, add this to your .git/config: [merge "ours] driver = true
43065247