diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:42:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-31 17:42:26 -0800 |
| commit | ddebfd1f27110bbcd0e8da0417bc425509af219a (patch) | |
| tree | 4d2fd8b58d9bc40674ee892fc7b024cc42b9e382 /xdiff | |
| parent | contrib/difftool: Don't repeat merge tool candidates (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint (diff) | |
| download | tgif-ddebfd1f27110bbcd0e8da0417bc425509af219a.tar.xz | |
Merge branch 'maint'
* maint:
merge: fix out-of-bounds memory access
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions