diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-11 11:32:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-11 11:32:00 -0700 |
| commit | 7980e41746bc5de91eea775f9142ce44b1100361 (patch) | |
| tree | 782007df51255ab3793e528a4b5c4a69342166f2 /git-gui/lib/merge.tcl | |
| parent | 0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f (diff) | |
| parent | b5e233ecc411c8685463333d180a135c6866c50e (diff) | |
Merge branch 'maint'
* maint:
post-receive-email: remove spurious commas in email subject
fast-import: export correctly marks larger than 2^20-1
t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATH
diff: strip extra "/" when stripping prefix
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions