diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-05-05 13:26:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-05 13:26:31 +0900 |
| commit | a849d36cf2877a1890371851710382f463290978 (patch) | |
| tree | 11c976041beacaa3bb1d7626d042a1026ea2a7eb /builtin/merge-recursive.c | |
| parent | Git 2.11.1 (diff) | |
| parent | Git 2.10.3 (diff) | |
| download | tgif-a849d36cf2877a1890371851710382f463290978.tar.xz | |
Merge branch 'maint-2.10' into maint-2.11
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions