From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Sep 2019 04:19:22 +0000 (+0900)
Subject: Merge branch 'js/visual-studio'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/59438be06c55d4366a01a2ff98bc0b8f02282894?hp=-c

Merge branch 'js/visual-studio'

Adjust .gitignore to unignore a path that we started to track.

* js/visual-studio:
.gitignore: stop ignoring `.manifest` files
---

59438be06c55d4366a01a2ff98bc0b8f02282894
diff --combined .gitignore
index 521d8f4fb4,692960406b..fc445edea9
--- a/.gitignore
+++ b/.gitignore
@@@ -58,7 -58,6 +58,7 @@@
  /git-difftool
  /git-difftool--helper
  /git-describe
 +/git-env--helper
  /git-fast-export
  /git-fast-import
  /git-fetch
@@@ -231,7 -230,6 +231,6 @@@
  *.ipdb
  *.dll
  .vs/
- *.manifest
  Debug/
  Release/
  /UpgradeLog*.htm