]> git.neil.brown.name Git - git.git/commitdiff
git / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af04b11 df8a9e8)
Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:07 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:08 +0000 (15:11 -0800)
"git p4" misbehaved when swapping a directory and a symbolic link.

* ld/p4-compare-dir-vs-symlink:
  git-p4: avoid crash adding symlinked directory

1  2 
git-p4.py patch | diff1 | diff2 | blob | history

diff --cc git-p4.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.