diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-04-16 23:29:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-16 23:29:34 -0700 |
| commit | 7b612c966ec3ee68fb60410db06222b7d728f965 (patch) | |
| tree | b8499e5afa7927424abde334f2150524e3210389 /mergetools/tortoisemerge | |
| parent | Merge branch 'sb/unpack-trees-would-lose-submodule-message-update' (diff) | |
| parent | difftool: fix use-after-free (diff) | |
| download | tgif-7b612c966ec3ee68fb60410db06222b7d728f965.tar.xz | |
Merge branch 'js/difftool-builtin'
Code cleanup.
* js/difftool-builtin:
difftool: fix use-after-free
difftool: avoid strcpy
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions