diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-14 14:39:43 -0700 |
| commit | f4507cea2481e81eacfcc706dfc6ec09f38ae731 (patch) | |
| tree | 8b403a519d573019174ca749a866e73305ec2ccb /attr.h | |
| parent | Merge branch 'js/rebase-autosquash-double-fixup-fix' (diff) | |
| parent | git-p4: recover from inconsistent perforce history (diff) | |
| download | tgif-f4507cea2481e81eacfcc706dfc6ec09f38ae731.tar.xz | |
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
Diffstat (limited to 'attr.h')
0 files changed, 0 insertions, 0 deletions