From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 30 Aug 2008 09:42:14 GMT
Subject: Re: [PATCH 07/12] merge.conflictstyle: choose between "merge" and "diff3 -m" styles
Message-ID: <alpine.DEB.1.00.0808301141160.24820@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To: <1220056963-2352-8-git-send-email-gitster@pobox.com>

Hi,

On Fri, 29 Aug 2008, Junio C Hamano wrote:

> diff --git a/builtin-merge-file.c b/builtin-merge-file.c
> index 1e92510..f009e73 100644
> --- a/builtin-merge-file.c
> +++ b/builtin-merge-file.c
> @@ -15,6 +15,15 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
>  	int ret = 0, i = 0, to_stdout = 0;
>  	int merge_level = XDL_MERGE_ZEALOUS_ALNUM;
>  	int merge_style = 0;
> +	int nongit;
> +
> +	prefix = setup_git_directory_gently(&nongit);
> +	if (!nongit) {
> +		/* Read the configuration file */
> +		git_config(git_xmerge_config, NULL);
> +		if (git_xmerge_style > 0)
> +			merge_style = git_xmerge_style;

Did you not mean ">="?  In the future, the default merge style could very 
well change...

Ciao,
Dscho