From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Dror Levy <drorlevy@live.com>
Cc: git@vger.kernel.org
Subject: Re: Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options
Date: Fri, 15 May 2015 16:35:15 +0200 [thread overview]
Message-ID: <dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org> (raw)
In-Reply-To: <loom.20150515T160501-69@post.gmane.org>
Hi,
On 2015-05-15 16:14, Dror Levy wrote:
> Using git version 1.9.5.msysgit.1
Please verify with Git for Windows 2.x (developers' preview) from https://git-for-windows.github.io/ whether the problem persists.
Ciao,
Johannes
next prev parent reply other threads:[~2015-05-15 14:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-15 13:56 Bug when merging non normalized branch with normalized branch using the -X theirs -X renormalize options Dror Levy
2015-05-15 14:14 ` Dror Levy
2015-05-15 14:35 ` Johannes Schindelin [this message]
2015-05-15 14:49 ` Dror Levy
2015-05-15 18:24 ` Johannes Schindelin
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=dba4955a359a93ff8fba2addc2de0e5a@www.dscho.org \
--to=johannes.schindelin@gmx.de \
--cc=drorlevy@live.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 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).