From: Junio C Hamano <gitster@pobox.com>
To: Matt McCutchen <matt@mattmccutchen.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-merge-recursive: honor merge.conflictstyle once again
Date: Sun, 19 Oct 2008 14:50:12 -0700 [thread overview]
Message-ID: <7vmyh05k6j.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1224376850.19061.1.camel@mattlaptop2.local> (Matt McCutchen's message of "Sat, 18 Oct 2008 20:40:50 -0400")
Matt McCutchen <matt@mattmccutchen.net> writes:
> This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2
> but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.
Good eyes; thanks.
prev parent reply other threads:[~2008-10-19 21:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-19 0:40 [PATCH] git-merge-recursive: honor merge.conflictstyle once again Matt McCutchen
2008-10-19 21:50 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmyh05k6j.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matt@mattmccutchen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).