diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-23 14:27:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-23 14:27:55 -0800 |
| commit | 0901d5a2ef80996cf64c8afeaec765e1bc09f795 (patch) | |
| tree | 72b1f5df7b0235174c0affe68ce549d697d762c1 /git-gui/lib/commit.tcl | |
| parent | 241b9254e1c8ff071d8054f8b6fbe1883b389d69 (diff) | |
| parent | 29b67543d3060a08bee601dbad91dd400e833052 (diff) | |
Merge branch 'maint'
* maint:
am: remove rebase-apply directory before gc
rerere: fix memory leak if rerere images can't be read
Documentation: mention conflict marker size argument (%L) for merge driver
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions