Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow vcxproj and sln files to merge as text. #474

Merged
merged 1 commit into from
Apr 24, 2019
Merged

Allow vcxproj and sln files to merge as text. #474

merged 1 commit into from
Apr 24, 2019

Commits on Apr 23, 2019

  1. Allow vcxproj and sln files to merge as text. 

    This will cause Git to insert conflict markers in the file and make it easier to identify and fix merge conflicts. Previously, Git would complain about conflicts with these files, but no markers were inserted.
    Daniel Belcher committed Apr 23, 2019
    Configuration menu
    Copy the full SHA
    9572c0d View commit details
    Browse the repository at this point in the history