Re: [PATCH 6/8] sh-tools: add a run_merge_tool function
- From
David Aguilar <davvid@gmail.com>
- Date
- Mar 30, 2009, 07:46 UTC
- Message-ID
- <20090330074625.GA11769@gmail.com>
- In-Reply-To
- <200903300932.29870.markus.heidelberg@web.de>
On 0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
Show 16 quoted lines
> David Aguilar, 30.03.2009:
> > +# Runs a side-by-side merge tool
> > +run_merge_tool()
> > +{
> > + merge_tool="$1"
> > +
> > + # base_present is always false when !mergetool_mode
> > + case "$merge_tool" in
> > + kdiff3)
> > [...]
>
> Kompare is missing here. Note, that this is only diff tool, not for
> merges.
>
> Markus
> Thanks, will fixup asap. I botched the --cover letter too ;) note to self: no more refactoring while sleepy on plane.
-- David