diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:39:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:39:39 -0700 |
| commit | c518059b263bb506b96a0ae90c4d40408c760cb0 (patch) | |
| tree | 501d1b53c20691a665469bab028b844c89e163b1 /builtin/merge.c | |
| parent | Second batch for 2.5 cycle (diff) | |
| parent | Sync with 2.3.8 (diff) | |
| download | tgif-c518059b263bb506b96a0ae90c4d40408c760cb0.tar.xz | |
Merge branch 'maint'
* maint:
Git 2.3.8
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions