From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 01 Sep 2008 07:52:37 GMT
Subject: Re: [PATCH 1/2] checkout --conflict=<style>: recreate merge in a non-default style
Message-ID: <48BB9F45.4070509@viscovery.net>
In-Reply-To: <7v4p501j2y.fsf@gitster.siamese.dyndns.org>

Junio C Hamano schrieb:
> +--conflict=<style>::
> +	The same as --merge option above, but changes the way the
> +	conflicting hunks are presented, overriding the
> +	merge.conflictstyle configuration variable.  Possible values are
> +	"merge" (default) and "diff3" (in addition to what is shown by
> +	"merge" style, shows the original contents).
> +

If --conflict is basically the same as --merge, couldn't we then pass
style argument to --merge or omit it to get the default style?

-- Hannes