diffmerge updates #8615
Merged
diffmerge updates #8615
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
Align GE patches with latest versions Remove unused diff scripts
Limitation in Git (not needed, historical?) As a workaround, 4d3285a added TortoiseDiff as an alias, but 'tortoisemerge' should be disabled as a difftool too. (Can still be added from the Git commandline if this is changed in Git.)
Only for image files, so mostly usable for custom difftool introduced in da2c85e
ghost
assigned 
Codecov Report
@@ Coverage Diff @@
## master #8615 +/- ##
==========================================
- Coverage 55.13% 55.12% -0.01%
==========================================
Files 904 906 +2
Lines 65506 65524 +18
Branches 11864 11864
==========================================
+ Hits 36115 36122 +7
- Misses 26561 26572 +11
Partials 2830 2830
Flags with carried forward coverage won't be shown. Click here to find out more. |
RussKie
approved these changes
Nov 15, 2020
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.
Proposed changes
Various minor changes to difftools (several of them will conflict if separate)
Can be squashed
Update TortoiseSVN merge scripts for old MS Office and LibreOffice
Retained the GE patches, made it easier to merge new changes
One option is to drop these scripts completely
Remove unused TortoiseSVN diff scripts
Disable tortoisemerge as a difftool
Limitation in Git (not needed, historical?)
As a workaround, 4d3285a added TortoiseDiff
as an alias, but 'tortoisemerge' should be disabled as a difftool too.
(Can still be added from the Git commandline if this is changed in Git.)
Only for image files, so mostly usable for custom difftool introduced
in da2c85e
DiffMerge: Incorrect suggested exe name
Related issue It is not possible to resolve conflict #8611
Add Sublime Merge (smerge) as a difftool
I looked into adding other diff/mergetools supported natively in Git,
smerge was the only I found useful
(I looked at the free versions of ExamDiff, Code Compare, Diffuse Merge)
Add TortoiseGitIDiff as difftool
Only for image files, so mostly usable for custom difftool introduced
in da2c85e
Test methodology
Updated tests, manual
✒️ I contribute this code under The Developer Certificate of Origin.