Re: [PATCH] Introducing cg-xxdiff for conflict resolution

On 9/24/06, Petr Baudis [off-list ref] wrote:

Hmm, I think this would be generally more useful during the actual merge
phase - if merge returns error, you fire up
git-magic-conflict-resolution-driver and have fun.

Well, in many cases the conflict markers are just ok and exactly what
I want. If the two sides of the conflict are clear, the resolution is
usually clear as well. OTOH, it may be a big mess where xxdiff gives
more visual cues as to WTF is going on...

IOW I don't want it to be part of the merge automagically...

quoted

+. git-sh-setup

Uh-oh. :-)

Is that bad? <blush> I am not doing anything too cogito-specific, and
I just don't know what cg-Xlib will do for me...

quoted

+git cat-file blob `git rev-parse FETCH_HEAD`:$FILE > $FILE~branch

Cogito does not use FETCH_HEAD.

eeek. you ar right. I mix and match git and cogito as you can see. Not
so smart. I see cg-merge uses merging, merge-base and merging-sym --
I'll rework it using those...

cheers,



martin