Re: Merging adjacent deleted lines?

From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Jan 22, 2009, 20:13 UTC
Message-ID: <200901222113.31082.robin.rosenberg.lists@dewire.com>
In-Reply-To: <57518fd10901220257p62b6d1efof97ba3fcf90dbfda@mail.gmail.com>

torsdag 22 januari 2009 11:57:41 skrev Jonathan del Strother:

Show 15 quoted lines

> On Wed, Jan 21, 2009 at 7:49 PM, Robin Rosenberg
> <robin.rosenberg.lists@dewire.com> wrote:
> > onsdag 21 januari 2009 20:20:50 skrev Jonathan del Strother:
> > [...]
> > I think you've illustrated a case for graphical merge resolution tools, i.e.
> > run git mergetool to help resolve the conlicts. It will run a graphical tool
> > for you.
> >
> 
> Mmm.  I use opendiff, which is generally ok, but in this case produced
> a merge looking like this :
> http://pastie.org/paste/asset/367587/Picture_6.png
> Which, in my mind, isn't any clearer about the fact that both lines
> ought to be deleted than the text conflict markers are.  Do any of the
> other graphical tools present conflicts like that differently?

Try a three-way merge tool instead like, e.g. xxdiff.

-- robin