From: Junio C Hamano <junkio@cox.net>
Date: Thu, 23 Feb 2006 03:46:59 +0000 (-0800)
Subject: Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next
X-Git-Tag: v1.3.0-rc1~54^2~41
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=63c2fcefd8b786ebe99d0beaa1ca3590cdc24609

Merge branches 'maint', 'jc/fix-co-candy' and 'jc/fix-rename-leak' into next

* maint:
  Give no terminating LF to error() function.

* jc/fix-co-candy:
  checkout - eye candy.

* jc/fix-rename-leak:
  diffcore-rename: plug memory leak.
---

63c2fcefd8b786ebe99d0beaa1ca3590cdc24609