From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 04 Mar 2007 13:29:08 GMT
Subject: Re: Conflict editing
Message-ID: <Pine.LNX.4.63.0703041427110.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <Pine.LNX.4.63.0703041339350.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Hi,

On Sun, 4 Mar 2007, Johannes Schindelin wrote:

> # Copyright (c) 2006, Shawn O. Pearce

As pointed out by Junio on IRC, I assigned the copyright to this small 
script to Shawn. Actually, I just forgot to edit that part after copying 
the script preamble from git-gc.sh.

Ciao,
Dscho