From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Feb 2017 21:36:55 +0000 (-0800)
Subject: Merge branch 'gv/mingw-p4-mapuser'
X-Git-Tag: v2.12.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a482cf446f2ced7fdd67faa2b3a55bfd5caf7d58;p=thirdparty%2Fgit.git

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
---

a482cf446f2ced7fdd67faa2b3a55bfd5caf7d58