diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-16 14:01:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-16 14:01:20 -0700 |
| commit | 7c9c2f8c394a4c1f4e09d6d5542c4e7965cc9240 (patch) | |
| tree | 8b98b9a9c8bfd63fec2a0244bab80f8b52a33ef5 /merge.c | |
| parent | 2846ef3e27ff0e34812dad788b706f0a1e5b5e80 (diff) | |
| download | git-7c9c2f8c394a4c1f4e09d6d5542c4e7965cc9240.tar.gz git-7c9c2f8c394a4c1f4e09d6d5542c4e7965cc9240.tar.xz | |
Preparing for 2.12.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions