From: David Aguilar <davvid@gmail.com>
Date: Wed, 01 Apr 2009 12:55:04 GMT
Subject: git-{diff,merge} refactor round 2
Message-ID: <1238590514-41893-1-git-send-email-davvid@gmail.com>

Here's the 2nd round of refactoring.

This is based on Junio's pu branch.

I'm including the difftool.prompt patch in this series
because it is a dependency and including it here makes
that obvious.

I tried to keep the dependencies untangled while still being
able to manage the various command-line flags all in one
place.  Alas, this is shell so it can only be so elegant.

I went ahead and rolled in the "remove -o $MERGED" from
tkdiff for the diff mode case.


Still TODO:
incorporate the "add diffuse as a merge tool" patch.

Is there more that can be refactored?
Probably the part that sets up candidate mergetools,
replacing that with a function might be useful.

Here's what I've got so far.