diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-24 15:29:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-24 15:29:13 -0700 |
| commit | ff6e93fe605b748055267fd325c760d0f32dcf92 (patch) | |
| tree | cd70b871a9496c5502b975236aa4c900af04ab28 /Documentation/git-merge.txt | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | http-push.c::remove_locks(): fix use after free (diff) | |
| download | tgif-ff6e93fe605b748055267fd325c760d0f32dcf92.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
http-push.c::remove_locks(): fix use after free
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions