diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:18:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 11:18:46 -0700 |
| commit | a8c565b227b408cb2ff2064482d2259df16e9e52 (patch) | |
| tree | b9617bbb33abcafa5177518b673a6d7b56e497d2 /t/t3030-merge-recursive.sh | |
| parent | 9b1c2a3a8e625ea7f56e9ba3d3c0e31938faa738 (diff) | |
| parent | 539e75069f5c8f0ecf9e99f1163647aa9f92c5bd (diff) | |
| download | git-a8c565b227b408cb2ff2064482d2259df16e9e52.tar.gz | |
Merge branch 'ek/alt-odb-entry-fix'
* ek/alt-odb-entry-fix:
sha1_file: do not add own object directory as alternate
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions