diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:39:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-16 12:39:58 -0700 |
| commit | 27ed4350b76deaaacc8b77d1272deec3433cbd38 (patch) | |
| tree | 820d59ecc5e89665edef43370a32e29a7958c620 /git-mergetool--lib.sh | |
| parent | 0e9b0ac712d09d77a10586f5ff669bf6af3dd538 (diff) | |
| parent | 6ff264ee05cc8fd6b2c796623eadb8662444a458 (diff) | |
| download | git-27ed4350b76deaaacc8b77d1272deec3433cbd38.tar.gz | |
Merge branch 'rs/unpack-trees-leakfix'
By René Scharfe
* rs/unpack-trees-leakfix:
unpack-trees: plug minor memory leak
unpack-trees: don't perform any index operation if we're not merging
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions