From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Thu, 02 Apr 2009 20:04:33 GMT
Subject: Re: [PATCH] {diff,merge}tool: rename helpers to remove them from tab-completion
Message-ID: <200904022204.34019.markus.heidelberg@web.de>
In-Reply-To: <1238672296-10265-1-git-send-email-davvid@gmail.com>

David Aguilar, 02.04.2009:
> diff --git a/Makefile b/Makefile
[..]
>  SCRIPT_SH += git-merge-resolve.sh
>  SCRIPT_SH += git-mergetool.sh
> -SCRIPT_SH += git-mergetool-lib.sh
> +SCRIPT_SH += git-mergetool--lib.sh
>  SCRIPT_SH += git-parse-remote.sh
>  SCRIPT_SH += git-pull.sh
>  SCRIPT_SH += git-quiltimport.sh

This conflicts with commit 496c021 (Add a script to edit/inspect notes)
in 'pu', which seems to be just merged today. If you build your patches
on top of 'da/difftool' (99511d8) instead of 'pu', then these conflicts
won't arise and avoid hassle.

In fact I already applied all your patches on top 'da/difftool' and not
'pu' all the time, until now.

Thanks for your work on this

Markus