RevGrid: Custom tools were only loaded at settings changes #10164
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
ghost
assigned 
mstv
approved these changes
Aug 22, 2022
gerhardol
added a commit
that referenced
this pull request
Aug 25, 2022
(cherry picked from commit 1d19b10)
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
Custom diff/mergetools (all known to Git) is available in RevDiff, Commit, FileHistory, ResolveConflicts
In RevGrid it is available only after settings, as the loading at startup was incorrect.
Custom difftool is useful for dir diff, as some difftools does not support dir diffs (like TortoiseDiff) and also if supported, may not be the best for dir diff.
Screenshots
Before
After
Test methodology
manual
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.