diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:16 -0800 |
| commit | 56e648e2534a4eb76713a8843354620599098fa6 (patch) | |
| tree | 5c6f3d7937a72f92bc62223b9eb69b9b4eaee8e5 /xdiff/xmerge.c | |
| parent | Merge branch 'bs/mirbsd' (diff) | |
| parent | Revert "prompt: clean up strbuf usage" (diff) | |
| download | tgif-56e648e2534a4eb76713a8843354620599098fa6.tar.xz | |
Merge branch 'jk/credential-plug-leak'
An earlier "clean-up" introduced an unnecessary memory leak.
* jk/credential-plug-leak:
Revert "prompt: clean up strbuf usage"
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions