From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 May 2020 21:39:43 +0000 (-0700)
Subject: Merge branch 'ao/p4-d-f-conflict-recover'
X-Git-Tag: v2.27.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4507cea2481e81eacfcc706dfc6ec09f38ae731;p=thirdparty%2Fgit.git

Merge branch 'ao/p4-d-f-conflict-recover'

"git p4" learned to recover from a (broken) state where a directory
and a file are recorded at the same path in the Perforce repository
the same way as their clients do.

* ao/p4-d-f-conflict-recover:
  git-p4: recover from inconsistent perforce history
---

f4507cea2481e81eacfcc706dfc6ec09f38ae731