Merge branch 'mt/p4-depotFile-at-version'
commit8f436d1374c7b8bd29118bd6344520dbaf83594b
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:55 +0000 (11 09:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:55 +0000 (11 09:29 -0700)
tree4b4714c43cd3a1374c0595fe89872b6a642ae909
parent829f03e98c63a69b0f3b6e40e012da8a0fe25e2a
parentf5f53f141087e8ba663d650399e8683c1fc6700b
Merge branch 'mt/p4-depotFile-at-version'

* mt/p4-depotFile-at-version:
  p4: retrieve the right revision of the file in UTF-16 codepath
git-p4.py