diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-23 22:25:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-23 22:25:32 -0800 |
| commit | 7bd1527d2d8c80a6e9a0f8583082a5aee5428c68 (patch) | |
| tree | 054f1026468c6435351ab7f0ad9ba407852812c4 /git-merge.sh | |
| parent | Give no terminating LF to error() function. (diff) | |
| parent | checkout - eye candy. (diff) | |
| parent | diffcore-rename: plug memory leak. (diff) | |
| parent | fix t5600-clone-fail-cleanup.sh on windows (diff) | |
| download | tgif-7bd1527d2d8c80a6e9a0f8583082a5aee5428c68.tar.xz | |
Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into maint
* jc/fix-co-candy:
checkout - eye candy.
* jc/fix-rename-leak:
diffcore-rename: plug memory leak.
* ar/fix-win:
fix t5600-clone-fail-cleanup.sh on windows