From 32be722fc0652d87414f0a703a9bc2eaf2abe668 Mon Sep 17 00:00:00 2001
From: Derrick Stolee <dstolee@microsoft.com>
Date: Mon, 5 Aug 2019 12:57:40 -0400
Subject: [PATCH] Update Git to include octopus merge bugfix

See microsoft/git#167 for details.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
 GVFS/GVFS.Build/GVFS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GVFS/GVFS.Build/GVFS.props b/GVFS/GVFS.Build/GVFS.props
index f7f622bdcc..06459df094 100644
--- a/GVFS/GVFS.Build/GVFS.props
+++ b/GVFS/GVFS.Build/GVFS.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <GVFSVersion>0.2.173.2</GVFSVersion>
-    <GitPackageVersion>2.20190729.1</GitPackageVersion>
+    <GitPackageVersion>2.20190805.1</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">