diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:20:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:20:58 -0700 |
| commit | f7446fc6bbe9c25f7064ba76b2db4dd67691f7d0 (patch) | |
| tree | 68e605b2bd790aedf5366ee7b93697e5cdc0238d /git-merge-resolve.sh | |
| parent | git-apply: fix option description (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-f7446fc6bbe9c25f7064ba76b2db4dd67691f7d0.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
Fix buffer overflow in config parser
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions