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 /builtin/merge-tree.c | |
| parent | Merge branch 'kb/hashmap-updates' (diff) | |
| parent | sha1_file: do not add own object directory as alternate (diff) | |
| download | tgif-a8c565b227b408cb2ff2064482d2259df16e9e52.tar.xz | |
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 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions