git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a2a0942 82e46d6)
Merge branch 'ao/p4-d-f-conflict-recover'
authorJunio C Hamano <redacted>
Thu, 14 May 2020 21:39:43 +0000 (14:39 -0700)
committerJunio C Hamano <redacted>
Thu, 14 May 2020 21:39:43 +0000 (14:39 -0700)
commitf4507cea2481e81eacfcc706dfc6ec09f38ae731
tree8b403a519d573019174ca749a866e73305ec2ccbtree | snapshot
parenta2a0942a16a6459d4a52e7ee4ec85f7f90ad5334commit | diff
parent82e46d6b837e96de5ee01f0298b600519aef1bbacommit | diff
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
git clone https://git.99rst.org/PROJECT