diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:28 -0700 |
| commit | a9d00b662f0fdb88434b85d2bd55ebfee227e0d7 (patch) | |
| tree | 07d96aeadb52c7ac626a9a1adaa4ac952b62f5f5 /git-difftool--helper.sh | |
| parent | Merge branch 'ts/checkout-advice-plural' (diff) | |
| parent | git-p4: fix filetype detection on files opened exclusively (diff) | |
| download | tgif-a9d00b662f0fdb88434b85d2bd55ebfee227e0d7.tar.xz | |
Merge branch 'ld/p4-filetype-detection'
* ld/p4-filetype-detection:
git-p4: fix filetype detection on files opened exclusively
git-p4: small fix for locked-file-move-test
git-p4: fix small bug in locked test scripts
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions