This repository was archived by the owner on Jun 21, 2023. It is now read-only.
Repository navigation
Save PR merge base file as UTF-8 if working file is UTF-8 - #1011
Merged
Merged
Conversation
jcansdale
force-pushed
the
fixes/1010-diff-encoding
branch
from
June 13, 2017 14:55
bb47311 to
fbf5a4f
Compare
It appears Visual Studio likes to add a UTF-8 header to files it touches. When creating a temp file to diff against, save as UTF-8 if working file is UTF-8. Fixes #1010
jcansdale
force-pushed
the
fixes/1010-diff-encoding
branch
from
June 13, 2017 15:14
fbf5a4f to
e9e3cd9
Compare
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It appears Visual Studio likes to add a UTF-8 header to files it touches.
When creating a temp file to diff against, save as UTF-8 if working file is UTF-8.
Fixes #1010