diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-04 03:41:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-04 03:41:24 -0700 |
| commit | 1eb71bc0ec609c67b8a308f9267691144a48bffd (patch) | |
| tree | 85e1c1054de559a38f2f620fcdf103ccf8f2467d /archive-zip.c | |
| parent | 44bc573436c98b7c6cd798af04c538f6e76f0f6e (diff) | |
| parent | 313ee0d69f58c2bf2f4e0a62b812c9d08a39b240 (diff) | |
| download | git-1eb71bc0ec609c67b8a308f9267691144a48bffd.tar.gz git-1eb71bc0ec609c67b8a308f9267691144a48bffd.tar.xz | |
Merge branch 'nm/maint-conflicted-submodule-entries'
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions