From: Junio C Hamano <gitster@pobox.com>
To: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Cc: git@vger.kernel.org
Subject: Re: core.autocrlf and merge conflict output
Date: Sun, 22 Jun 2008 17:45:35 -0700 [thread overview]
Message-ID: <7vy74xj7ww.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <g3miho$se5$1@ger.gmane.org> (Edward Z. Yang's message of "Sun, 22 Jun 2008 18:08:59 -0400")
"Edward Z. Yang" <edwardzyang@thewritingpot.com> writes:
> Apparently, the conflict information Git writes to the working copy
> during merge doesn't respect core.autocrlf,...
Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
when writing out the result, 2008-06-09) happened?
next prev parent reply other threads:[~2008-06-23 0:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-22 22:08 core.autocrlf and merge conflict output Edward Z. Yang
2008-06-23 0:45 ` Junio C Hamano [this message]
2008-06-23 1:47 ` Edward Z. Yang
2008-06-23 1:54 ` Junio C Hamano
2008-06-23 2:00 ` Johannes Schindelin
2008-06-23 2:23 ` Edward Z. Yang
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=7vy74xj7ww.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=edwardzyang@thewritingpot.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.