diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:48 -0700 |
| commit | 04959836795da4c82bc9b12bebdfb294ea12943f (patch) | |
| tree | 1e8ddc2a9abb9ccc9fedc49777047aebb30069e9 /t/t3308-notes-merge.sh | |
| parent | Merge branch 'mm/add-p-split-error' (diff) | |
| parent | git-p4: improve client path detection when branches are used (diff) | |
| download | tgif-04959836795da4c82bc9b12bebdfb294ea12943f.tar.xz | |
Merge branch 'va/p4-client-path'
git p4 attempts to better handle branches in Perforce.
* va/p4-client-path:
git-p4: improve client path detection when branches are used
t9801: check git-p4's branch detection with client spec enabled
Diffstat (limited to 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions