From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Thu, 02 Apr 2009 20:16:50 GMT
Subject: Re: [PATCH 10/10] mergetool: use run_mergetool from git-mergetool-lib
Message-ID: <200904022216.51159.markus.heidelberg@web.de>
In-Reply-To: <200904022213.15173.markus.heidelberg@web.de>

Markus Heidelberg, 02.04.2009:
> Huh, it seems as if some editors for difftool cannot work correctly
> currently, because this function is used, but defined in
> git-mergetool.sh.

Yes, it works...

# Overridden in git-mergetool
check_unchanged () {
	true
}

But that's not really nice, is it? Maybe we'd be better with a

    if merge_mode; then

inside this function and only define it in git-mergetool--lib.sh.

Markus