| commit | f4507cea2481e81eacfcc706dfc6ec09f38ae731 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 May 2020 21:39:43 +0000 (14 14:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 May 2020 21:39:43 +0000 (14 14:39 -0700) | ||
| tree | 8b403a519d573019174ca749a866e73305ec2ccb | treesnapshot (tar.gz zip) |
| parent | a2a0942a16a6459d4a52e7ee4ec85f7f90ad5334 | commitdiff |
| parent | 82e46d6b837e96de5ee01f0298b600519aef1bba | commitdiff |
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 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