diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-13 17:09:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 17:09:45 -0700 |
| commit | dfe50511c7e5ec2bc771c9a5f4c3318332a7744e (patch) | |
| tree | 1666306983a1943e1f7b2988ab29cef18a9492a3 /git-gui/lib/merge.tcl | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | git-rerere.txt: grammatical fixups and cleanups (diff) | |
| download | tgif-dfe50511c7e5ec2bc771c9a5f4c3318332a7744e.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
git-rerere.txt: grammatical fixups and cleanups
http-push.c::remove_locks(): fix use after free
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions