Remove Git and KDiff3 from installer #4930
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
Codecov Report
@@ Coverage Diff @@
## master #4930 +/- ##
==========================================
- Coverage 34.51% 34.51% -0.01%
==========================================
Files 542 542
Lines 43154 43154
Branches 5967 5967
==========================================
- Hits 14896 14895 -1
- Misses 27521 27522 +1
Partials 737 737 |
RussKie
approved these changes
May 10, 2018
Setup/UI/WixUI.wxs
Outdated
| <Publish Dialog="GitEx_RequiredSoftwareDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">1</Publish> | ||
| <Publish Dialog="GitEx_RequiredSoftwareDlg" Control="Next" Event="NewDialog" Value="GitEx_InstallDirDlg">1</Publish> | ||
| <Publish Dialog="GitEx_InstallDirDlg" Control="Back" Event="NewDialog" Value="GitEx_RequiredSoftwareDlg">1</Publish> | ||
| <?else?> | ||
| <Publish Dialog="GitEx_WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallScopeDlg">1</Publish> | ||
| <Publish Dialog="InstallScopeDlg" Control="Back" Event="NewDialog" Value="GitEx_WelcomeDlg" Order="1">1</Publish> | ||
| <Publish Dialog="InstallScopeDlg" Control="Next" Event="NewDialog" Value="GitEx_InstallDirDlg" Order="1">1</Publish> | ||
| <Publish Dialog="GitEx_InstallDirDlg" Control="Back" Event="NewDialog" Value="InstallScopeDlg">1</Publish> |
There was a problem hiding this comment.
Do we need to fix the indentation for the remaining lines?
I will update |
|
(At least) awaiting kdiff3 discussion in #4515 before merging (if there are changes, that is a separate PR though) |
This was referenced May 10, 2018
gerhardol
added a commit
to gerhardol/gitextensions
that referenced
this pull request
May 11, 2018
gitextensions#4515 remove Git and KDiff3 from installer (cherry picked from commit 3d161ed)
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.
Part of #4515
Changes proposed in this pull request:
The following is not done:
This PR should go into 2.5 branch too, eventually
Screenshots before and after (if PR changes UI):
None
What did I do to test the code and ensure quality:
Has been tested on (remove any that don't apply):