Confirm copy all in file merge #1827
Merged
Conversation
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
|
Thank you! |
sdottaka
added a commit
that referenced
this pull request
May 1, 2023
|
In commit cccf9c8 I changed "Are you sure you want top copy ALL diffs to the other file?" to "Are you sure you want to copy all differences to the other file?". Please let me know if you see any problems with this change. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
WinMerge is my new favorite diff and merge tool. Thank you.
But unfortunately it easily happens to copy all diffs to the other file instead of one specific difference without noticing it.
To avoid this I added a new "Are you sure you want top copy ALL diffs to other file?" dialog. The dialog can be turned off like the other dialogs.
For localization I also added the translation to my native language german and the Spanish.po file.