diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:08 -0800 |
| commit | aa83f7a2a4a677e9eca4a599f47e027ad06716d1 (patch) | |
| tree | 8ac18913cd47a341f829c0c96d788b4746f57bd3 /diffcore-delta.c | |
| parent | af04b1171b9ed16f5acce0a49fe3bda518a40b7e (diff) | |
| parent | df8a9e86db13f2b8becfde8ed69f80127ba14e20 (diff) | |
| download | git-aa83f7a2a4a677e9eca4a599f47e027ad06716d1.tar.gz git-aa83f7a2a4a677e9eca4a599f47e027ad06716d1.tar.xz | |
Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
"git p4" misbehaved when swapping a directory and a symbolic link.
* ld/p4-compare-dir-vs-symlink:
git-p4: avoid crash adding symlinked directory
Diffstat (limited to 'diffcore-delta.c')
0 files changed, 0 insertions, 0 deletions