diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:38 -0700 |
| commit | ec34a8b135182ed41786cd87295d7086283dee64 (patch) | |
| tree | 76ee81a33f3ab2ec9791c90e79ac161dd18fe48e /mergetools/vimdiff | |
| parent | Merge branch 'da/difftool' (diff) | |
| parent | rerere: remove an null statement (diff) | |
| download | tgif-ec34a8b135182ed41786cd87295d7086283dee64.tar.xz | |
Merge branch 'jc/rerere-multi'
* jc/rerere-multi:
rerere: remove an null statement
rerere: plug memory leaks upon "rerere forget" failure
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions