Re: Conflict editing

From: Shawn O. Pearce <spearce@spearce.org>
Date: Mar 4, 2007, 23:40 UTC
Message-ID: <20070304234030.GA20116@spearce.org>
In-Reply-To: <Pine.LNX.4.63.0703041339350.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 8 quoted lines

> I often end up with conflicts, and I just want to edit the conflicting 
> files, one after another. To make this easier, I wrote a script (yes, no 
> builtin) to start the editor with the files having conflicts.
> 
> -- snipsnap --
> #!/bin/sh
> #
> # Copyright (c) 2006, Shawn O. Pearce

Sweet! My evil plan is working... you do all of the work and I get all of the credit! Last year to boot! ;-)

Yes, I did see the other message about how you copied the preamble from git-gc.sh... ;-)

-- 
Shawn.