Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Git to v2.25.0 #270

Merged
merged 2 commits into from
Jan 17, 2020
Merged

Update Git to v2.25.0 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e3b940
Update Git to v2.25.0
derrickstolee Dec 30, 2019
297a557
Update warning message case
derrickstolee Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<!-- Version information -->
<ScalarVersion>0.2.173.2</ScalarVersion>
<GitPackageVersion>2.20191231.1</GitPackageVersion>
<GitPackageVersion>2.20200116.1</GitPackageVersion>
<WatchmanPackageUrl>https://github.com/facebook/watchman/suites/307436006/artifacts/304557</WatchmanPackageUrl>
<GcmCoreOSXPackageUrl>https://github.com/microsoft/Git-Credential-Manager-Core/releases/download/v2.0.79-beta/gcmcore-osx-2.0.79.64449.pkg</GcmCoreOSXPackageUrl>

Expand Down
2 changes: 1 addition & 1 deletion Scalar.FunctionalTests/Tests/EnlistmentPerFixture/SparseSetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Scalar.FunctionalTests.Tests.EnlistmentPerFixture
public class SparseSetTests : TestsWithEnlistmentPerFixture
{
private const string SetOverwriteMessage = "would be overwritten by sparse checkout update";
private const string SetIndexStateMessage = "You need to resolve your current index first";
private const string SetIndexStateMessage = "you need to resolve your current index first";

private const string FolderDotGit = ".git";
private const string FolderDeleteFileTests = "DeleteFileTests";
Expand Down