diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-30 15:01:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-30 15:01:31 -0700 |
| commit | 05bb78abc179b47f6288b990c1ba8f3d403cad1d (patch) | |
| tree | 1a5dc09b15a2922a7596374fff1031b878d83cfc /builtin/merge-recursive.c | |
| parent | Git 2.11.2 (diff) | |
| parent | Git 2.10.4 (diff) | |
| download | tgif-05bb78abc179b47f6288b990c1ba8f3d403cad1d.tar.xz | |
Merge tag 'v2.10.4' into maint-2.11
Git 2.10.4
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions