diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-29 06:54:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-29 06:54:26 (GMT) |
| commit | cdd5b82ee8e6941eee9c7b09df63c44789fd5c4b (patch) | |
| tree | cded11d5f1df83bad67218e61cfb71596567b214 /git-gui/lib/merge.tcl | |
| parent | c63a3ad2c1d6f86cd7989055a133e06055239317 (diff) | |
| parent | 7faf068660f0a060066ccbc80f7debbba6bc2d76 (diff) | |
| download | git-cdd5b82ee8e6941eee9c7b09df63c44789fd5c4b.zip git-cdd5b82ee8e6941eee9c7b09df63c44789fd5c4b.tar.gz git-cdd5b82ee8e6941eee9c7b09df63c44789fd5c4b.tar.bz2 | |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
git-svn: avoid md5 calculation entirely if SVN doesn't provide one
Fix stupid typo in lookup_tag()
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions