diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:04:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:04:12 -0700 |
| commit | 8624735d9aca62ffaef84de3b2b8345b1771086a (patch) | |
| tree | fe703f91a35d43291de03689f65e5374592bdf3b /xdiff/xmerge.c | |
| parent | Merge branch 'jh/send-email-one-cc' into maint (diff) | |
| download | tgif-8624735d9aca62ffaef84de3b2b8345b1771086a.tar.xz | |
Prepare for 2.12.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions