Created
December 5, 2013 03:03
-
-
Save danshultz/7799509 to your computer and use it in GitHub Desktop.
better git csproj file merges
https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html#_built_in_merge_drivers
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| *.csproj text=auto merge=union | |
| *.sln -text merge=union |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment