diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-01 14:43:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-01 14:43:58 -0700 |
| commit | d48929e1c39a01cf2d909ba140110df481c8912d (patch) | |
| tree | 22a134370d6e6deb4019240baf0fba75d17b0410 /builtin/merge-recursive.c | |
| parent | Merge branch 'an/shallow-doc' into maint (diff) | |
| parent | sha1_file.c: "legacy" is really the current format (diff) | |
| download | tgif-d48929e1c39a01cf2d909ba140110df481c8912d.tar.xz | |
Merge branch 'jc/legacy-loose-object' into maint
* jc/legacy-loose-object:
sha1_file.c: "legacy" is really the current format
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions