Merge branch 'gv/mingw-p4-mapuser'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000 (13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000 (13:36 -0800)
commita482cf446f2ced7fdd67faa2b3a55bfd5caf7d58
tree4df5673a3157e6ecaa610bb4f50371684c86e4a8
parent6f1c08bdb75b37ad30103f0f12339780fdc004e2
parentc3c2b057767c037b32a276e14bf563383ce82e39
Merge branch 'gv/mingw-p4-mapuser'

"git p4" did not work well with multiple git-p4.mapUser entries on
Windows.

* gv/mingw-p4-mapuser:
  git-p4: fix git-p4.mapUser on Windows
git-p4.py